Bluetooth: Remove local_bh_disable() from hci_sock.c

Gustavo F. Padovan · Gustavo F. Padovan · commit 4b5dd696f81b · 2012-01-02T22:20:12.000-02:00
Everything is in process context now, we do not need such a call.

Acked-by: Marcel Holtmann &lt;marcel@holtmann.org&gt;
Signed-off-by: Gustavo F. Padovan &lt;padovan@profusion.mobi&gt;
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
@@ -767,7 +767,6 @@ static int hci_sock_dev_event(struct notifier_block *this, unsigned long event,
 		/* Detach sockets from device */
 		read_lock(&hci_sk_list.lock);
 		sk_for_each(sk, node, &hci_sk_list.head) {
-			local_bh_disable();
 			bh_lock_sock_nested(sk);
 			if (hci_pi(sk)->hdev == hdev) {
 				hci_pi(sk)->hdev = NULL;
@@ -778,7 +777,6 @@ static int hci_sock_dev_event(struct notifier_block *this, unsigned long event,
 				hci_dev_put(hdev);
 			}
 			bh_unlock_sock(sk);
-			local_bh_enable();
 		}
 		read_unlock(&hci_sk_list.lock);
 	}

Original file line number	Diff line number	Diff line change
`@@ -767,7 +767,6 @@ static int hci_sock_dev_event(struct notifier_block *this, unsigned long event,`
`767`	`767`	`/* Detach sockets from device */`
`768`	`768`	`read_lock(&hci_sk_list.lock);`
`769`	`769`	`sk_for_each(sk, node, &hci_sk_list.head) {`
`770`		`- local_bh_disable();`
`771`	`770`	`bh_lock_sock_nested(sk);`
`772`	`771`	`if (hci_pi(sk)->hdev == hdev) {`
`773`	`772`	`hci_pi(sk)->hdev = NULL;`
`@@ -778,7 +777,6 @@ static int hci_sock_dev_event(struct notifier_block *this, unsigned long event,`
`778`	`777`	`hci_dev_put(hdev);`
`779`	`778`	`}`
`780`	`779`	`bh_unlock_sock(sk);`
`781`		`- local_bh_enable();`
`782`	`780`	`}`
`783`	`781`	`read_unlock(&hci_sk_list.lock);`
`784`	`782`	`}`