linux-next: manual merge of the bluetooth tree with the wirelesstree

From: Stephen Rothwell
Date: Thu Sep 26 2013 - 23:27:18 EST

Hi Gustavo,

Today's linux-next merge of the bluetooth tree got a conflict in
net/bluetooth/hci_core.c between commit 5e130367d43f ("Bluetooth:
Introduce a new HCI_RFKILLED flag") from the wireless tree and commit
0736cfa8e5bb ("Bluetooth: Introduce user channel flag for HCI devices")
from the bluetooth tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

P.S. that closing brace is badly indented :-(
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc net/bluetooth/hci_core.c
index 1b66547,3d9f02b..0000000
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@@ -1570,13 -1642,13 +1646,16 @@@ static int hci_rfkill_set_block(void *d

BT_DBG("%p name %s blocked %d", hdev, hdev->name, blocked);

+ if (test_bit(HCI_USER_CHANNEL, &hdev->dev_flags))
+ return -EBUSY;
- if (!blocked)
- return 0;
- hci_dev_do_close(hdev);
+ if (blocked) {
+ set_bit(HCI_RFKILLED, &hdev->dev_flags);
+ if (!test_bit(HCI_SETUP, &hdev->dev_flags))
+ hci_dev_do_close(hdev);
+ } else {
+ clear_bit(HCI_RFKILLED, &hdev->dev_flags);

return 0;

Attachment: pgp00000.pgp
Description: PGP signature