]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
update queue-4.19/ipv4-update-exception-handling-for-multipath-routes-via-same-device...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 26 Sep 2020 15:47:11 +0000 (17:47 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 26 Sep 2020 15:47:11 +0000 (17:47 +0200)
queue-4.19/ipv4-update-exception-handling-for-multipath-routes-via-same-device.patch

index d43cc353683cb2f04253b6c9eab64b916deab306..13eda75238edb4f9863ae1310baaabb5d391b20c 100644 (file)
@@ -112,14 +112,17 @@ Signed-off-by: David Ahern <dsahern@kernel.org>
 Signed-off-by: David S. Miller <davem@davemloft.net>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- net/ipv4/route.c |   11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
+ net/ipv4/route.c |   13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
 
 --- a/net/ipv4/route.c
 +++ b/net/ipv4/route.c
-@@ -779,6 +779,8 @@ static void __ip_do_redirect(struct rtab
+@@ -777,8 +777,10 @@ static void __ip_do_redirect(struct rtab
+                       neigh_event_send(n, NULL);
+               } else {
                        if (fib_lookup(net, fl4, &res, 0) == 0) {
-                               struct fib_nh *nh = &FIB_RES_NH(res);
+-                              struct fib_nh *nh = &FIB_RES_NH(res);
++                              struct fib_nh *nh;
  
 +                              fib_select_path(net, &res, fl4, skb);
 +                              nh = &FIB_RES_NH(res);