diff options
author | David S. Miller <davem@davemloft.net> | 2011-05-03 23:25:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-05-03 23:25:42 -0400 |
commit | 31e4543db29fb85496a122b965d6482c8d1a2bfe (patch) | |
tree | 3e49d61a1202e1b3c8c71e422f3fd8e4f2616d01 /net/ipv4/ip_output.c | |
parent | f1390160ddcd64a3cfd48b3280d0a616a31b9520 (diff) |
ipv4: Make caller provide on-stack flow key to ip_route_output_ports().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_output.c')
-rw-r--r-- | net/ipv4/ip_output.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index 362e66f7d2fb..3aa4c31e5448 100644 --- a/net/ipv4/ip_output.c +++ b/net/ipv4/ip_output.c | |||
@@ -333,6 +333,7 @@ int ip_queue_xmit(struct sk_buff *skb) | |||
333 | /* Make sure we can route this packet. */ | 333 | /* Make sure we can route this packet. */ |
334 | rt = (struct rtable *)__sk_dst_check(sk, 0); | 334 | rt = (struct rtable *)__sk_dst_check(sk, 0); |
335 | if (rt == NULL) { | 335 | if (rt == NULL) { |
336 | struct flowi4 fl4; | ||
336 | __be32 daddr; | 337 | __be32 daddr; |
337 | 338 | ||
338 | /* Use correct destination address if we have options. */ | 339 | /* Use correct destination address if we have options. */ |
@@ -344,7 +345,7 @@ int ip_queue_xmit(struct sk_buff *skb) | |||
344 | * keep trying until route appears or the connection times | 345 | * keep trying until route appears or the connection times |
345 | * itself out. | 346 | * itself out. |
346 | */ | 347 | */ |
347 | rt = ip_route_output_ports(sock_net(sk), sk, | 348 | rt = ip_route_output_ports(sock_net(sk), &fl4, sk, |
348 | daddr, inet->inet_saddr, | 349 | daddr, inet->inet_saddr, |
349 | inet->inet_dport, | 350 | inet->inet_dport, |
350 | inet->inet_sport, | 351 | inet->inet_sport, |