aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2011-07-24 00:11:07 -0400
committerJaikumar Ganesh <jaikumar@google.com>2011-08-02 15:11:00 -0700
commit1a86ece6587209ab1c941e2fea6ff4943a49cc0b (patch)
tree8a95569f55f7b34e5d162fde90de29e41f82baf8 /net/bluetooth
parentd7581077a3dec95d77ea5c343eb51e4ad6d44968 (diff)
downloadkernel_samsung_crespo-1a86ece6587209ab1c941e2fea6ff4943a49cc0b.zip
kernel_samsung_crespo-1a86ece6587209ab1c941e2fea6ff4943a49cc0b.tar.gz
kernel_samsung_crespo-1a86ece6587209ab1c941e2fea6ff4943a49cc0b.tar.bz2
Bluetooth: bnep: Fix lost wakeup of session thread
Fix race condition which can result in missing the wakeup intended to stop the session thread. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/bnep/core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index ca39fcf..7e8ff3c 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -484,9 +484,11 @@ static int bnep_session(void *arg)
init_waitqueue_entry(&wait, current);
add_wait_queue(sk_sleep(sk), &wait);
- while (!kthread_should_stop()) {
+ while (1) {
set_current_state(TASK_INTERRUPTIBLE);
+ if (kthread_should_stop())
+ break;
/* RX */
while ((skb = skb_dequeue(&sk->sk_receive_queue))) {
skb_orphan(skb);
@@ -504,7 +506,7 @@ static int bnep_session(void *arg)
schedule();
}
- set_current_state(TASK_RUNNING);
+ __set_current_state(TASK_RUNNING);
remove_wait_queue(sk_sleep(sk), &wait);
/* Cleanup session */