aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/hci_sock.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2012-02-20 15:24:37 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-20 16:08:36 -0500
commit4b95a24ce12c4545fd7d2e3075841dc3119d1d71 (patch)
tree938a5668877d32de6c8f88abab15ad6438f645a6 /net/bluetooth/hci_sock.c
parentd7b7e79688c07b445bc52adfedf9a176be156f4b (diff)
Bluetooth: Always enable management interface
The management interface API has reached stable version 1.0 and thus it can now be always enabled. All future changes will be made backwards compatible. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/hci_sock.c')
-rw-r--r--net/bluetooth/hci_sock.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 8c429a179aa4..dd5635064145 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -50,8 +50,6 @@
50#include <net/bluetooth/hci_core.h> 50#include <net/bluetooth/hci_core.h>
51#include <net/bluetooth/hci_mon.h> 51#include <net/bluetooth/hci_mon.h>
52 52
53static bool enable_mgmt;
54
55static atomic_t monitor_promisc = ATOMIC_INIT(0); 53static atomic_t monitor_promisc = ATOMIC_INIT(0);
56 54
57/* ----- HCI socket interface ----- */ 55/* ----- HCI socket interface ----- */
@@ -651,7 +649,7 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_le
651 break; 649 break;
652 650
653 case HCI_CHANNEL_CONTROL: 651 case HCI_CHANNEL_CONTROL:
654 if (haddr.hci_dev != HCI_DEV_NONE || !enable_mgmt) { 652 if (haddr.hci_dev != HCI_DEV_NONE) {
655 err = -EINVAL; 653 err = -EINVAL;
656 goto done; 654 goto done;
657 } 655 }
@@ -1129,6 +1127,3 @@ void hci_sock_cleanup(void)
1129 1127
1130 proto_unregister(&hci_sk_proto); 1128 proto_unregister(&hci_sk_proto);
1131} 1129}
1132
1133module_param(enable_mgmt, bool, 0644);
1134MODULE_PARM_DESC(enable_mgmt, "Enable Management interface");