ipv4: fix ipsec forward performance regression

There is bug in commit 5e2b61f(ipv4: Remove flowi from struct rtable).
It makes xfrm4_fill_dst() modify wrong data structure.

Signed-off-by: Zheng Yan <[email protected]>
Reported-by: Kim Phillips <[email protected]>
Acked-by: Eric Dumazet <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index fc5368ad2b0d160b9429f8f830aed6d9da223d77..a0b4c5da8d43a9ad0bac1f2614c375b61bd17aa0 100644 (file)
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -79,13 +79,13 @@ static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
        struct rtable *rt = (struct rtable *)xdst->route;
        const struct flowi4 *fl4 = &fl->u.ip4;
 
-       rt->rt_key_dst = fl4->daddr;
-       rt->rt_key_src = fl4->saddr;
-       rt->rt_key_tos = fl4->flowi4_tos;
-       rt->rt_route_iif = fl4->flowi4_iif;
-       rt->rt_iif = fl4->flowi4_iif;
-       rt->rt_oif = fl4->flowi4_oif;
-       rt->rt_mark = fl4->flowi4_mark;
+       xdst->u.rt.rt_key_dst = fl4->daddr;
+       xdst->u.rt.rt_key_src = fl4->saddr;
+       xdst->u.rt.rt_key_tos = fl4->flowi4_tos;
+       xdst->u.rt.rt_route_iif = fl4->flowi4_iif;
+       xdst->u.rt.rt_iif = fl4->flowi4_iif;
+       xdst->u.rt.rt_oif = fl4->flowi4_oif;
+       xdst->u.rt.rt_mark = fl4->flowi4_mark;
 
        xdst->u.dst.dev = dev;
        dev_hold(dev);