Skip to content

Commit

Permalink
Bluetooth: Always enable management interface
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Marcel Holtmann authored and Johan Hedberg committed Feb 20, 2012
1 parent d7b7e79 commit 4b95a24
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions net/bluetooth/hci_sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 ----- */
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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");

0 comments on commit 4b95a24

Please sign in to comment.