diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-17 14:02:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-20 13:36:54 -0700 |
| commit | ba3f7f04ef2b19aace38f855aedd17fe43035d50 (patch) | |
| tree | 223992e7b2a180042ca9d024c315346ca08454ec /net/ipv4/tcp_ipv4.c | |
| parent | d2d68ba9fe8b38eb03124b3176a013bb8aa2b5e5 (diff) | |
| download | blackbird-op-linux-ba3f7f04ef2b19aace38f855aedd17fe43035d50.tar.gz blackbird-op-linux-ba3f7f04ef2b19aace38f855aedd17fe43035d50.zip | |
ipv4: Kill FLOWI_FLAG_RT_NOCACHE and associated code.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 1d8b75a58981..59110caeb074 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -824,7 +824,7 @@ static int tcp_v4_send_synack(struct sock *sk, struct dst_entry *dst, struct sk_buff * skb; /* First, grab a route. */ - if (!dst && (dst = inet_csk_route_req(sk, &fl4, req, nocache)) == NULL) + if (!dst && (dst = inet_csk_route_req(sk, &fl4, req)) == NULL) return -1; skb = tcp_make_synack(sk, dst, req, rvp); @@ -1378,7 +1378,7 @@ int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) */ if (tmp_opt.saw_tstamp && tcp_death_row.sysctl_tw_recycle && - (dst = inet_csk_route_req(sk, &fl4, req, want_cookie)) != NULL && + (dst = inet_csk_route_req(sk, &fl4, req)) != NULL && fl4.daddr == saddr) { if (!tcp_peer_is_proven(req, dst, true)) { NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_PAWSPASSIVEREJECTED); |
