summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2010-05-10 11:33:10 +0200
committerMarcel Holtmann <marcel@holtmann.org>2010-05-10 11:33:10 +0200
commit2b0b05ddc04b6d45e71cd36405df512075786f1e (patch)
tree28b1451f4d34d00d273fbdd9018c32f2cb186d2a
parent7b767cad296d17cfe071734f71a3b7b479534c8c (diff)
downloadop-kernel-dev-2b0b05ddc04b6d45e71cd36405df512075786f1e.zip
op-kernel-dev-2b0b05ddc04b6d45e71cd36405df512075786f1e.tar.gz
Bluetooth: Fix issues where sk_sleep() helper is needed now
There were some left-overs that used sk->sk_sleep instead of the new sk_sleep() helper. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--net/bluetooth/l2cap.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index ba49f9a..673a368 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -1248,7 +1248,7 @@ static int __l2cap_wait_ack(struct sock *sk)
int err = 0;
int timeo = HZ/5;
- add_wait_queue(sk->sk_sleep, &wait);
+ add_wait_queue(sk_sleep(sk), &wait);
while ((l2cap_pi(sk)->unacked_frames > 0 && l2cap_pi(sk)->conn)) {
set_current_state(TASK_INTERRUPTIBLE);
@@ -1269,7 +1269,7 @@ static int __l2cap_wait_ack(struct sock *sk)
break;
}
set_current_state(TASK_RUNNING);
- remove_wait_queue(sk->sk_sleep, &wait);
+ remove_wait_queue(sk_sleep(sk), &wait);
return err;
}
@@ -3544,7 +3544,7 @@ static void l2cap_busy_work(struct work_struct *work)
lock_sock(sk);
- add_wait_queue(sk->sk_sleep, &wait);
+ add_wait_queue(sk_sleep(sk), &wait);
while ((skb = skb_peek(BUSY_QUEUE(sk)))) {
set_current_state(TASK_INTERRUPTIBLE);
@@ -3603,7 +3603,7 @@ done:
pi->conn_state &= ~L2CAP_CONN_RNR_SENT;
set_current_state(TASK_RUNNING);
- remove_wait_queue(sk->sk_sleep, &wait);
+ remove_wait_queue(sk_sleep(sk), &wait);
release_sock(sk);
}
OpenPOWER on IntegriCloud