diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2010-05-10 05:33:10 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2010-05-10 05:33:10 -0400 |
commit | 2b0b05ddc04b6d45e71cd36405df512075786f1e (patch) | |
tree | 28b1451f4d34d00d273fbdd9018c32f2cb186d2a | |
parent | 7b767cad296d17cfe071734f71a3b7b479534c8c (diff) |
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.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index ba49f9a3579e..673a36886716 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
@@ -1248,7 +1248,7 @@ static int __l2cap_wait_ack(struct sock *sk) | |||
1248 | int err = 0; | 1248 | int err = 0; |
1249 | int timeo = HZ/5; | 1249 | int timeo = HZ/5; |
1250 | 1250 | ||
1251 | add_wait_queue(sk->sk_sleep, &wait); | 1251 | add_wait_queue(sk_sleep(sk), &wait); |
1252 | while ((l2cap_pi(sk)->unacked_frames > 0 && l2cap_pi(sk)->conn)) { | 1252 | while ((l2cap_pi(sk)->unacked_frames > 0 && l2cap_pi(sk)->conn)) { |
1253 | set_current_state(TASK_INTERRUPTIBLE); | 1253 | set_current_state(TASK_INTERRUPTIBLE); |
1254 | 1254 | ||
@@ -1269,7 +1269,7 @@ static int __l2cap_wait_ack(struct sock *sk) | |||
1269 | break; | 1269 | break; |
1270 | } | 1270 | } |
1271 | set_current_state(TASK_RUNNING); | 1271 | set_current_state(TASK_RUNNING); |
1272 | remove_wait_queue(sk->sk_sleep, &wait); | 1272 | remove_wait_queue(sk_sleep(sk), &wait); |
1273 | return err; | 1273 | return err; |
1274 | } | 1274 | } |
1275 | 1275 | ||
@@ -3544,7 +3544,7 @@ static void l2cap_busy_work(struct work_struct *work) | |||
3544 | 3544 | ||
3545 | lock_sock(sk); | 3545 | lock_sock(sk); |
3546 | 3546 | ||
3547 | add_wait_queue(sk->sk_sleep, &wait); | 3547 | add_wait_queue(sk_sleep(sk), &wait); |
3548 | while ((skb = skb_peek(BUSY_QUEUE(sk)))) { | 3548 | while ((skb = skb_peek(BUSY_QUEUE(sk)))) { |
3549 | set_current_state(TASK_INTERRUPTIBLE); | 3549 | set_current_state(TASK_INTERRUPTIBLE); |
3550 | 3550 | ||
@@ -3603,7 +3603,7 @@ done: | |||
3603 | pi->conn_state &= ~L2CAP_CONN_RNR_SENT; | 3603 | pi->conn_state &= ~L2CAP_CONN_RNR_SENT; |
3604 | 3604 | ||
3605 | set_current_state(TASK_RUNNING); | 3605 | set_current_state(TASK_RUNNING); |
3606 | remove_wait_queue(sk->sk_sleep, &wait); | 3606 | remove_wait_queue(sk_sleep(sk), &wait); |
3607 | 3607 | ||
3608 | release_sock(sk); | 3608 | release_sock(sk); |
3609 | } | 3609 | } |