Commit d4fb3d74d7a17833de2ba8cbd4f029b30feb4825
1 parent
072d8c9414
Exists in
master
and in
7 other branches
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: David S. Miller <davem@davemloft.net>
Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff
net/ipv4/tcp_ipv4.c
| ... | ... | @@ -190,7 +190,7 @@ |
| 190 | 190 | } |
| 191 | 191 | |
| 192 | 192 | if (!inet_opt || !inet_opt->opt.srr) |
| 193 | - daddr = rt->rt_dst; | |
| 193 | + daddr = fl4.daddr; | |
| 194 | 194 | |
| 195 | 195 | if (!inet->inet_saddr) |
| 196 | 196 | inet->inet_saddr = fl4.saddr; |
| ... | ... | @@ -204,7 +204,7 @@ |
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | if (tcp_death_row.sysctl_tw_recycle && |
| 207 | - !tp->rx_opt.ts_recent_stamp && rt->rt_dst == daddr) { | |
| 207 | + !tp->rx_opt.ts_recent_stamp && fl4.daddr == daddr) { | |
| 208 | 208 | struct inet_peer *peer = rt_get_peer(rt); |
| 209 | 209 | /* |
| 210 | 210 | * VJ's idea. We save last timestamp seen from |