From: Greg Kroah-Hartman Date: Sat, 26 Sep 2020 15:47:11 +0000 (+0200) Subject: update queue-4.19/ipv4-update-exception-handling-for-multipath-routes-via-same-device... X-Git-Tag: v4.19.148~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9315d0694b8e3867e2ada58c18a38b00df37760;p=thirdparty%2Fkernel%2Fstable-queue.git update queue-4.19/ipv4-update-exception-handling-for-multipath-routes-via-same-device.patch --- diff --git a/queue-4.19/ipv4-update-exception-handling-for-multipath-routes-via-same-device.patch b/queue-4.19/ipv4-update-exception-handling-for-multipath-routes-via-same-device.patch index d43cc353683..13eda75238e 100644 --- a/queue-4.19/ipv4-update-exception-handling-for-multipath-routes-via-same-device.patch +++ b/queue-4.19/ipv4-update-exception-handling-for-multipath-routes-via-same-device.patch @@ -112,14 +112,17 @@ Signed-off-by: David Ahern Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- - 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);