Skip to content

Commit

Permalink
ipv4: Get route daddr from flow key in tcp_v4_connect().
Browse files Browse the repository at this point in the history
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: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Apr 29, 2011
1 parent 072d8c9 commit d4fb3d7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/ipv4/tcp_ipv4.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down

0 comments on commit d4fb3d7

Please sign in to comment.