Hi!
[ Upstream commit 2fbc6e89b2f1403189e624cabaf73e189c5e50c6 ]
Kfir reported that pmtu exceptions are not created properly for deployments where multipath routes use the same device.
This is mismerged (in a way that does not affect functionality):
@@ -779,6 +779,8 @@ static void __ip_do_redirect(struct rtab if (fib_lookup(net, fl4, &res, 0) == 0) { struct fib_nh *nh = &FIB_RES_NH(res);
fib_select_path(net, &res, fl4, skb);nh = &FIB_RES_NH(res); update_or_create_fnhe(nh, fl4->daddr, new_gw, 0, false,
nh is assigned value that is never used. Mainline patch removes the assignment (but variable has different type).
4.19 should delete the assignment, too.
Best regards, Pavel
Signed-off-by: Pavel Machek (CIP) pavel@denx.de
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index f60e28418ece..84de87b7eedc 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -777,7 +777,7 @@ static void __ip_do_redirect(struct rtable *rt, struct sk_buff *skb, struct flow 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_select_path(net, &res, fl4, skb); nh = &FIB_RES_NH(res);