lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: l2cap: Fix lost wakeup waiting for ERTM acks

Browse Source 
Fix race condition which can result in missing wakeup during
l2cap socket shutdown.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Peter Hurley
2011-07-25 18:36:26 -04:00
committed by Gustavo F. Padovan
parent 3a3f5c7df5
commit a71a0cf4e9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/bluetooth/l2cap_core.c
View File

@@ -1159,9 +1159,8 @@ int __l2cap_wait_ack(struct sock *sk)
int timeo = HZ/5; int timeo = HZ/5;
add_wait_queue(sk_sleep(sk), &wait); add_wait_queue(sk_sleep(sk), &wait);
while ((chan->unacked_frames > 0 && chan->conn)) { set_current_state(TASK_INTERRUPTIBLE);
set_current_state(TASK_INTERRUPTIBLE); while (chan->unacked_frames > 0 && chan->conn) {
if (!timeo) if (!timeo)
timeo = HZ/5; timeo = HZ/5;
@@ -1173,6 +1172,7 @@ int __l2cap_wait_ack(struct sock *sk)
release_sock(sk); release_sock(sk);
timeo = schedule_timeout(timeo); timeo = schedule_timeout(timeo);
lock_sock(sk); lock_sock(sk);
set_current_state(TASK_INTERRUPTIBLE);
err = sock_error(sk); err = sock_error(sk);
if (err) if (err)