summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2010-09-09 10:32:39 +0300
committerGustavo F. Padovan <padovan@profusion.mobi>2010-10-12 12:44:52 -0300
commit80e2c88803c72747cb19febe2ad708bf0ad557bf (patch)
treea719028d5767d0d80e43804eb1797abe4133c644 /net/bluetooth
parent5017d8dde13313cab1e607379536a7930ed682b0 (diff)
downloadlinux-stable-80e2c88803c72747cb19febe2ad708bf0ad557bf.tar.gz
linux-stable-80e2c88803c72747cb19febe2ad708bf0ad557bf.tar.bz2
linux-stable-80e2c88803c72747cb19febe2ad708bf0ad557bf.zip
Bluetooth: Don't clear the blacklist when closing the HCI device
Clearing the blacklist in hci_dev_do_close() would mean that user space needs to do extra work to re-block devices after a DEVDOWN-DEVUP cycle. This patch removes the clearing of the blacklist in this case and thereby saves user space from the extra work. Signed-off-by: Johan Hedberg <johan.hedberg@nokia.com> Acked-by: Ville Tervo <ville.tervo@nokia.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_core.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index c52f091ee6de..bc2a052e518b 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -562,7 +562,6 @@ static int hci_dev_do_close(struct hci_dev *hdev)
hci_dev_lock_bh(hdev);
inquiry_cache_flush(hdev);
hci_conn_hash_flush(hdev);
- hci_blacklist_clear(hdev);
hci_dev_unlock_bh(hdev);
hci_notify(hdev, HCI_DEV_DOWN);