Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b57ae01a authored by David S. Miller's avatar David S. Miller
Browse files

ipv4: Use cork flow in ip_queue_xmit() 



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: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e869138

net/ipv4/ip_output.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -317,6 +317,7 @@ int ip_queue_xmit(struct sk_buff *skb) 
	struct sock *sk = skb->sk;

	struct sock *sk = skb->sk;

	struct inet_sock *inet = inet_sk(sk);

	struct inet_sock *inet = inet_sk(sk);

	struct ip_options_rcu *inet_opt;

	struct ip_options_rcu *inet_opt;

	struct flowi4 *fl4;

	struct rtable *rt;

	struct rtable *rt;

	struct iphdr *iph;

	struct iphdr *iph;

	int res;

	int res;
@@ -331,9 +332,9 @@ int ip_queue_xmit(struct sk_buff *skb) 
		goto packet_routed;

		goto packet_routed;





	/* Make sure we can route this packet. */

	/* Make sure we can route this packet. */

	fl4 = &inet->cork.fl.u.ip4;

	rt = (struct rtable *)__sk_dst_check(sk, 0);

	rt = (struct rtable *)__sk_dst_check(sk, 0);

	if (rt == NULL) {

	if (rt == NULL) {

		struct flowi4 fl4;

		__be32 daddr;

		__be32 daddr;





		/* Use correct destination address if we have options. */

		/* Use correct destination address if we have options. */
@@ -345,7 +346,7 @@ int ip_queue_xmit(struct sk_buff *skb) 
		 * keep trying until route appears or the connection times

		 * keep trying until route appears or the connection times

		 * itself out.

		 * 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,

					   daddr, inet->inet_saddr,

					   inet->inet_dport,

					   inet->inet_dport,

					   inet->inet_sport,

					   inet->inet_sport,