]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
ipv4: Get route daddr from flow key in inet_csk_route_req().
authorDavid S. Miller <davem@davemloft.net>
Fri, 29 Apr 2011 06:50:09 +0000 (23:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 29 Apr 2011 06:50:09 +0000 (23:50 -0700)
Now that output route lookups update the flow with
destination address selection, we can fetch it from
fl4->daddr instead of rt->rt_dst

Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/inet_connection_sock.c

index 3282cb2de3935b7470712e6f981c1cf5510d49d4..54944da2f794bc90e9a19c819fd6b8431c7aeba3 100644 (file)
@@ -367,7 +367,7 @@ struct dst_entry *inet_csk_route_req(struct sock *sk,
        rt = ip_route_output_flow(net, &fl4, sk);
        if (IS_ERR(rt))
                goto no_route;
-       if (opt && opt->opt.is_strictroute && rt->rt_dst != rt->rt_gateway)
+       if (opt && opt->opt.is_strictroute && fl4.daddr != rt->rt_gateway)
                goto route_err;
        return &rt->dst;