summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-04-28 23:50:09 -0700
committerDavid S. Miller <davem@davemloft.net>2011-04-28 23:50:09 -0700
commit072d8c94142a3a95151774975f6c1fd1dc1f1e1b (patch)
tree12b59dc795d4da572e56a80a364883c2eaa2a01f
parent87321c839fb4a65b5d78c16d79d1674cf223a452 (diff)
downloadop-kernel-dev-072d8c94142a3a95151774975f6c1fd1dc1f1e1b.zip
op-kernel-dev-072d8c94142a3a95151774975f6c1fd1dc1f1e1b.tar.gz
ipv4: Get route daddr from flow key in inet_csk_route_req().
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>
-rw-r--r--net/ipv4/inet_connection_sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c
index 3282cb2..54944da 100644
--- a/net/ipv4/inet_connection_sock.c
+++ b/net/ipv4/inet_connection_sock.c
@@ -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;
OpenPOWER on IntegriCloud