From c03937e42406690cb2f9a8999fc48b0ac7d8868a Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 10 May 2010 11:33:10 +0200 Subject: [PATCH] --- yaml --- r: 194879 b: refs/heads/master c: 2b0b05ddc04b6d45e71cd36405df512075786f1e h: refs/heads/master i: 194877: a40fc27340eaa749c6f017929210600d9a2e2bde 194875: d5a6f8f8eae311c95208c8b3ffb74b9d762d5e5e 194871: df7b45613a48c19370797493efd3d3fc95600bc9 194863: 6053ebe59fdd2fdc66d516fa7feedf68f3b4f394 194847: ac871180ec16fbe62ccf48bf9fe3f49bc3704b25 194815: d885444ff3ced5e9e018af35595a9d41f0d367e9 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/l2cap.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cdc7ce7ca548..68b49b0c620d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b767cad296d17cfe071734f71a3b7b479534c8c +refs/heads/master: 2b0b05ddc04b6d45e71cd36405df512075786f1e diff --git a/trunk/net/bluetooth/l2cap.c b/trunk/net/bluetooth/l2cap.c index ba49f9a3579e..673a36886716 100644 --- a/trunk/net/bluetooth/l2cap.c +++ b/trunk/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 @@ static void l2cap_busy_work(struct work_struct *work) 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); }