diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-14 19:58:44 -0500 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-12-18 14:07:57 -0500 |
commit | 3c54711c4fd103edf2044ab60726939f1de02b0c (patch) | |
tree | 3d223484adad4b641deff803182d97f9ece914b2 /net/bluetooth/hci_conn.c | |
parent | bf4c63252490ba78fb833cc7acf1a5b1900c970f (diff) |
Bluetooth: Don't disable tasklets to call hdev->notify()
It's pointless, we aren't protecting anything since btusb_notify()
schedules a work to run, then all it operation happens without protection.
If protection is really needed here, we will fix it further.
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/hci_conn.c')
-rw-r--r-- | net/bluetooth/hci_conn.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 5e9e193ac71e..385cccbcafe0 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c | |||
@@ -419,11 +419,8 @@ struct hci_conn *hci_conn_add(struct hci_dev *hdev, int type, bdaddr_t *dst) | |||
419 | hci_dev_hold(hdev); | 419 | hci_dev_hold(hdev); |
420 | 420 | ||
421 | hci_conn_hash_add(hdev, conn); | 421 | hci_conn_hash_add(hdev, conn); |
422 | if (hdev->notify) { | 422 | if (hdev->notify) |
423 | tasklet_disable(&hdev->tx_task); | ||
424 | hdev->notify(hdev, HCI_NOTIFY_CONN_ADD); | 423 | hdev->notify(hdev, HCI_NOTIFY_CONN_ADD); |
425 | tasklet_enable(&hdev->tx_task); | ||
426 | } | ||
427 | 424 | ||
428 | atomic_set(&conn->devref, 0); | 425 | atomic_set(&conn->devref, 0); |
429 | 426 | ||
@@ -468,11 +465,8 @@ int hci_conn_del(struct hci_conn *conn) | |||
468 | hci_chan_list_flush(conn); | 465 | hci_chan_list_flush(conn); |
469 | 466 | ||
470 | hci_conn_hash_del(hdev, conn); | 467 | hci_conn_hash_del(hdev, conn); |
471 | if (hdev->notify) { | 468 | if (hdev->notify) |
472 | tasklet_disable(&hdev->tx_task); | ||
473 | hdev->notify(hdev, HCI_NOTIFY_CONN_DEL); | 469 | hdev->notify(hdev, HCI_NOTIFY_CONN_DEL); |
474 | tasklet_enable(&hdev->tx_task); | ||
475 | } | ||
476 | 470 | ||
477 | skb_queue_purge(&conn->data_q); | 471 | skb_queue_purge(&conn->data_q); |
478 | 472 | ||