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

tcp: Use cork flow in tcp_v4_connect() 



Since this is invoked from inet_stream_connect() the socket is locked
and therefore this usage is safe.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c42758c

net/ipv4/tcp_ipv4.c

+7 −6
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	struct tcp_sock *tp = tcp_sk(sk);

	__be16 orig_sport, orig_dport;

	__be32 daddr, nexthop;

	struct flowi4 fl4;

	struct flowi4 *fl4;

	struct rtable *rt;

	int err;

	struct ip_options_rcu *inet_opt;
@@ -173,7 +173,8 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 


	orig_sport = inet->inet_sport;

	orig_dport = usin->sin_port;

	rt = ip_route_connect(&fl4, nexthop, inet->inet_saddr,

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

	rt = ip_route_connect(fl4, nexthop, inet->inet_saddr,

			      RT_CONN_FLAGS(sk), sk->sk_bound_dev_if,

			      IPPROTO_TCP,

			      orig_sport, orig_dport, sk, true);
@@ -190,10 +191,10 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	}



	if (!inet_opt || !inet_opt->opt.srr)

		daddr = fl4.daddr;

		daddr = fl4->daddr;



	if (!inet->inet_saddr)

		inet->inet_saddr = fl4.saddr;

		inet->inet_saddr = fl4->saddr;

	inet->inet_rcv_saddr = inet->inet_saddr;



	if (tp->rx_opt.ts_recent_stamp && inet->inet_daddr != daddr) {
@@ -204,7 +205,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	}



	if (tcp_death_row.sysctl_tw_recycle &&

	    !tp->rx_opt.ts_recent_stamp && fl4.daddr == daddr) {

	    !tp->rx_opt.ts_recent_stamp && fl4->daddr == daddr) {

		struct inet_peer *peer = rt_get_peer(rt);

		/*

		 * VJ's idea. We save last timestamp seen from
@@ -240,7 +241,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	if (err)

		goto failure;



	rt = ip_route_newports(&fl4, rt, orig_sport, orig_dport,

	rt = ip_route_newports(fl4, rt, orig_sport, orig_dport,

			       inet->inet_sport, inet->inet_dport, sk);

	if (IS_ERR(rt)) {

		err = PTR_ERR(rt);