diff options
| author | David S. Miller <davem@davemloft.net> | 2016-02-23 00:09:14 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-02-23 00:09:14 -0500 |
| commit | b633353115e352d3c31c12d4c61978c810f05ea1 (patch) | |
| tree | 055174a1b31a3e10fd2c505788fe6487b0028d00 /net/dccp/ipv6.c | |
| parent | b1d95ae5c5bd3deba84d00c4f83d7d0836b5936f (diff) | |
| parent | dea08e604408d0303e2332896c5fdd8c1f7d79a2 (diff) | |
| download | linux-stable-b633353115e352d3c31c12d4c61978c810f05ea1.tar.gz linux-stable-b633353115e352d3c31c12d4c61978c810f05ea1.tar.bz2 linux-stable-b633353115e352d3c31c12d4c61978c810f05ea1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/phy/bcm7xxx.c
drivers/net/phy/marvell.c
drivers/net/vxlan.c
All three conflicts were cases of simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ipv6.c')
| -rw-r--r-- | net/dccp/ipv6.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 45cbe85f0940..4663a01d5039 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -691,26 +691,26 @@ lookup: if (sk->sk_state == DCCP_NEW_SYN_RECV) { struct request_sock *req = inet_reqsk(sk); - struct sock *nsk = NULL; + struct sock *nsk; sk = req->rsk_listener; - if (likely(sk->sk_state == DCCP_LISTEN)) { - nsk = dccp_check_req(sk, skb, req); - } else { + if (unlikely(sk->sk_state != DCCP_LISTEN)) { inet_csk_reqsk_queue_drop_and_put(sk, req); goto lookup; } + sock_hold(sk); + nsk = dccp_check_req(sk, skb, req); if (!nsk) { reqsk_put(req); - goto discard_it; + goto discard_and_relse; } if (nsk == sk) { - sock_hold(sk); reqsk_put(req); } else if (dccp_child_process(sk, nsk, skb)) { dccp_v6_ctl_send_reset(sk, skb); - goto discard_it; + goto discard_and_relse; } else { + sock_put(sk); return 0; } } |