diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-02-01 05:17:02 -0500 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2013-02-01 05:17:02 -0500 |
| commit | d954896edb658cf72dd069d92b5235c06521ffab (patch) | |
| tree | fe8b798176191c681c6b2fa1c81aa55dc98568dc /net/core/request_sock.c | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
| parent | 12ad10004645d38356b14d1fbba379c523a61916 (diff) | |
Merge branch 'timers/for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-rmk/broadcast
Diffstat (limited to 'net/core/request_sock.c')
| -rw-r--r-- | net/core/request_sock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/request_sock.c b/net/core/request_sock.c index c31d9e8668c3..4425148d2b51 100644 --- a/net/core/request_sock.c +++ b/net/core/request_sock.c | |||
| @@ -186,8 +186,6 @@ void reqsk_fastopen_remove(struct sock *sk, struct request_sock *req, | |||
| 186 | struct fastopen_queue *fastopenq = | 186 | struct fastopen_queue *fastopenq = |
| 187 | inet_csk(lsk)->icsk_accept_queue.fastopenq; | 187 | inet_csk(lsk)->icsk_accept_queue.fastopenq; |
| 188 | 188 | ||
| 189 | BUG_ON(!spin_is_locked(&sk->sk_lock.slock) && !sock_owned_by_user(sk)); | ||
| 190 | |||
| 191 | tcp_sk(sk)->fastopen_rsk = NULL; | 189 | tcp_sk(sk)->fastopen_rsk = NULL; |
| 192 | spin_lock_bh(&fastopenq->lock); | 190 | spin_lock_bh(&fastopenq->lock); |
| 193 | fastopenq->qlen--; | 191 | fastopenq->qlen--; |