Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cfd5a23 authored by Jukka Rissanen's avatar Jukka Rissanen Committed by Marcel Holtmann
Browse files

Bluetooth: Wrong style spin lock used 



Use spin_lock_bh() as the code is called from softirq in networking subsystem.
This is needed to prevent deadlocks when 6lowpan link is in use.

Signed-off-by: default avatarJukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent e23e9ec1

net/bluetooth/hci_core.c

+7 −3
Original line number Diff line number Diff line
@@ -4661,8 +4661,12 @@ static void hci_queue_acl(struct hci_chan *chan, struct sk_buff_head *queue, 


		skb_shinfo(skb)->frag_list = NULL;



		/* Queue all fragments atomically */

		spin_lock(&queue->lock);

		/* Queue all fragments atomically. We need to use spin_lock_bh

		 * here because of 6LoWPAN links, as there this function is

		 * called from softirq and using normal spin lock could cause

		 * deadlocks.

		 */

		spin_lock_bh(&queue->lock);



		__skb_queue_tail(queue, skb);
@@ -4679,7 +4683,7 @@ static void hci_queue_acl(struct hci_chan *chan, struct sk_buff_head *queue, 
			__skb_queue_tail(queue, skb);

		} while (list);



		spin_unlock(&queue->lock);

		spin_unlock_bh(&queue->lock);

	}

}