diff options
| author | Andre Guedes <andre.guedes@openbossa.org> | 2011-09-09 18:56:24 -0300 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-09-21 12:59:16 -0300 |
| commit | a8f13c8cd2c732828e5da735c204447a55cdab03 (patch) | |
| tree | bbb5da005171f047c84033d078d7e50233578a97 /net/bluetooth | |
| parent | 51beabdf624df14d0805b001d3f939629b70d9db (diff) | |
| download | linux-stable-a8f13c8cd2c732828e5da735c204447a55cdab03.tar.gz linux-stable-a8f13c8cd2c732828e5da735c204447a55cdab03.tar.bz2 linux-stable-a8f13c8cd2c732828e5da735c204447a55cdab03.zip | |
Bluetooth: Reduce critical region.
This patch reduces the critial region (protected by hdev->lock) in
hci_cc_le_set_scan_enable(). This way, only really required code is
synchronized.
Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_event.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index fd6eea0941b6..35083f2aa2ea 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -898,16 +898,15 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, if (!cp) return; - hci_dev_lock(hdev); - if (cp->enable == 0x01) { del_timer(&hdev->adv_timer); + + hci_dev_lock(hdev); hci_adv_entries_clear(hdev); + hci_dev_unlock(hdev); } else if (cp->enable == 0x00) { mod_timer(&hdev->adv_timer, jiffies + ADV_CLEAR_TIMEOUT); } - - hci_dev_unlock(hdev); } static void hci_cc_le_ltk_reply(struct hci_dev *hdev, struct sk_buff *skb) |