From e34d39ddbd96a90e1b1c46272148bf2fa3073239 Mon Sep 17 00:00:00 2001
From: Gustavo Padovan <gustavo@padovan.org>
Date: Thu, 29 Mar 2012 09:47:53 -0300
Subject: [PATCH] --- yaml --- r: 299040 b: refs/heads/master c:
 66f3b913e68e8e62bd2f9499495eeb6cc81b2662 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/include/net/bluetooth/hci.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eaad985b6cd6..0a322524fab9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e8b506310f6433d5558387fd568d4bfb1d6a799
+refs/heads/master: 66f3b913e68e8e62bd2f9499495eeb6cc81b2662
diff --git a/trunk/include/net/bluetooth/hci.h b/trunk/include/net/bluetooth/hci.h
index 8f928f75e85e..d47e523c9d83 100644
--- a/trunk/include/net/bluetooth/hci.h
+++ b/trunk/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;