Skip to content

Commit

Permalink
ipv4: Use cork flow in ip_queue_xmit()
Browse files Browse the repository at this point in the history
All invokers of ip_queue_xmit() must make certain that the
socket is locked.  All of SCTP, TCP, DCCP, and L2TP now make
sure this is the case.

Therefore we can use the cork flow during output route lookup in
ip_queue_xmit() when the socket route check fails.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed May 8, 2011
1 parent 6e86913 commit b57ae01
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions net/ipv4/ip_output.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ int ip_queue_xmit(struct sk_buff *skb)
struct sock *sk = skb->sk;
struct inet_sock *inet = inet_sk(sk);
struct ip_options_rcu *inet_opt;
struct flowi4 *fl4;
struct rtable *rt;
struct iphdr *iph;
int res;
Expand All @@ -331,9 +332,9 @@ int ip_queue_xmit(struct sk_buff *skb)
goto packet_routed;

/* Make sure we can route this packet. */
fl4 = &inet->cork.fl.u.ip4;
rt = (struct rtable *)__sk_dst_check(sk, 0);
if (rt == NULL) {
struct flowi4 fl4;
__be32 daddr;

/* Use correct destination address if we have options. */
Expand All @@ -345,7 +346,7 @@ int ip_queue_xmit(struct sk_buff *skb)
* keep trying until route appears or the connection times
* itself out.
*/
rt = ip_route_output_ports(sock_net(sk), &fl4, sk,
rt = ip_route_output_ports(sock_net(sk), fl4, sk,
daddr, inet->inet_saddr,
inet->inet_dport,
inet->inet_sport,
Expand Down

0 comments on commit b57ae01

Please sign in to comment.