summaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo@padovan.org>2012-03-29 09:47:53 -0300
committerGustavo Padovan <gustavo@padovan.org>2012-04-05 15:05:51 -0300
commit66f3b913e68e8e62bd2f9499495eeb6cc81b2662 (patch)
treeede083c071261502b9281c42c069e0ce61937e6e /include/net
parent2e8b506310f6433d5558387fd568d4bfb1d6a799 (diff)
downloadlinux-3.10-66f3b913e68e8e62bd2f9499495eeb6cc81b2662.tar.gz
linux-3.10-66f3b913e68e8e62bd2f9499495eeb6cc81b2662.tar.bz2
linux-3.10-66f3b913e68e8e62bd2f9499495eeb6cc81b2662.zip
Bluetooth: Fix userspace compatibility issue with mgmt interface
To ensure that old user space versions do not accidentally pick up and try to use the management channel, use a different channel number. Reported-by: Keith Packard <keithp@keithp.com> Acked-by: Johan Hedberg <johan.hedberg@intel.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/bluetooth/hci.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 8f928f75e85..d47e523c9d8 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -1328,8 +1328,8 @@ struct sockaddr_hci {
#define HCI_DEV_NONE 0xffff
#define HCI_CHANNEL_RAW 0
-#define HCI_CHANNEL_CONTROL 1
#define HCI_CHANNEL_MONITOR 2
+#define HCI_CHANNEL_CONTROL 3
struct hci_filter {
unsigned long type_mask;