diff options
| author | David S. Miller | 2015-08-13 16:23:11 -0700 |
|---|---|---|
| committer | David S. Miller | 2015-08-13 16:23:11 -0700 |
| commit | 182ad468e70fc7e8ff2e5d64344c690beaa00ddd (patch) | |
| tree | af0b9b8da89ed03629c71f6829845c301485d289 /net/ipv4/tcp_ipv4.c | |
| parent | e8fed985d7bd6cda695e196028b54a5f3d2d91bb (diff) | |
| parent | 5b3e2e14eaa2a98232a4f292341fb88438685734 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/cavium/Kconfig
The cavium conflict was overlapping dependency
changes.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index d27eb549ced6..93898e093d4e 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1348,7 +1348,7 @@ static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb) req = inet_csk_search_req(sk, th->source, iph->saddr, iph->daddr); if (req) { nsk = tcp_check_req(sk, skb, req, false); - if (!nsk) + if (!nsk || nsk == sk) reqsk_put(req); return nsk; } |