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

ipv4: Get route daddr from flow key in tcp_v4_connect(). 



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

net/ipv4/tcp_ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) 
	}



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

		daddr = rt->rt_dst;

		daddr = fl4.daddr;



	if (!inet->inet_saddr)

		inet->inet_saddr = fl4.saddr;
@@ -204,7 +204,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 && rt->rt_dst == 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