From aadc6b9deb710f139e0469f41ff8e04f9ecd66e4 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Mon, 20 Feb 2012 21:24:37 +0100
Subject: [PATCH] --- yaml --- r: 290993 b: refs/heads/master c:
 4b95a24ce12c4545fd7d2e3075841dc3119d1d71 h: refs/heads/master i:   290991:
 51bfb23084f96ba93bf9b957497bbb74627c5f59 v: v3

---
 [refs]                         | 2 +-
 trunk/net/bluetooth/hci_sock.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 36ac70b23a72..19c51a12c19e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7b7e79688c07b445bc52adfedf9a176be156f4b
+refs/heads/master: 4b95a24ce12c4545fd7d2e3075841dc3119d1d71
diff --git a/trunk/net/bluetooth/hci_sock.c b/trunk/net/bluetooth/hci_sock.c
index 8c429a179aa4..dd5635064145 100644
--- a/trunk/net/bluetooth/hci_sock.c
+++ b/trunk/net/bluetooth/hci_sock.c
@@ -50,8 +50,6 @@
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/hci_mon.h>
 
-static bool enable_mgmt;
-
 static atomic_t monitor_promisc = ATOMIC_INIT(0);
 
 /* ----- HCI socket interface ----- */
@@ -651,7 +649,7 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_le
 		break;
 
 	case HCI_CHANNEL_CONTROL:
-		if (haddr.hci_dev != HCI_DEV_NONE || !enable_mgmt) {
+		if (haddr.hci_dev != HCI_DEV_NONE) {
 			err = -EINVAL;
 			goto done;
 		}
@@ -1129,6 +1127,3 @@ void hci_sock_cleanup(void)
 
 	proto_unregister(&hci_sk_proto);
 }
-
-module_param(enable_mgmt, bool, 0644);
-MODULE_PARM_DESC(enable_mgmt, "Enable Management interface");