Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 290993
b: refs/heads/master
c: 4b95a24
h: refs/heads/master
i:
  290991: 51bfb23
v: v3
  • Loading branch information
Marcel Holtmann authored and Johan Hedberg committed Feb 20, 2012
1 parent 69e2b6b commit aadc6b9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d7b7e79688c07b445bc52adfedf9a176be156f4b
refs/heads/master: 4b95a24ce12c4545fd7d2e3075841dc3119d1d71
7 changes: 1 addition & 6 deletions trunk/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 aadc6b9

Please sign in to comment.