diff options
| author | Johan Hedberg | 2014-07-02 16:37:27 +0200 |
|---|---|---|
| committer | Marcel Holtmann | 2014-07-03 17:42:57 +0200 |
| commit | a3451d279f839d987cbcf25b0f3be666aef99d0b (patch) | |
| tree | 3f7573f26dfca7dfb28945e5b41388ee1dcbc1e2 /net | |
| parent | Bluetooth: Add specific connection parameter clear functions (diff) | |
| download | kernel-qcow2-linux-a3451d279f839d987cbcf25b0f3be666aef99d0b.tar.gz kernel-qcow2-linux-a3451d279f839d987cbcf25b0f3be666aef99d0b.tar.xz kernel-qcow2-linux-a3451d279f839d987cbcf25b0f3be666aef99d0b.zip | |
Bluetooth: Add new auto_conn value matching mgmt action 0x00
The 0x00 action value of mgmt means "scan and report" but do not
connect. This is different from HCI_AUTO_CONN_DISABLED so we need a new
value for it.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/hci_core.c | 1 | ||||
| -rw-r--r-- | net/bluetooth/mgmt.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index 7e46a7c6092f..a3cd0bbd3518 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c @@ -3547,6 +3547,7 @@ int hci_conn_params_set(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type, switch (auto_connect) { case HCI_AUTO_CONN_DISABLED: + case HCI_AUTO_CONN_REPORT: case HCI_AUTO_CONN_LINK_LOSS: hci_pend_le_conn_del(hdev, addr, addr_type); break; diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 29850e76ea3c..f7217f9eda03 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c @@ -5034,7 +5034,7 @@ static int add_device(struct sock *sk, struct hci_dev *hdev, if (cp->action) auto_conn = HCI_AUTO_CONN_ALWAYS; else - auto_conn = HCI_AUTO_CONN_DISABLED; + auto_conn = HCI_AUTO_CONN_REPORT; /* If the connection parameters don't exist for this device, * they will be created and configured with defaults. |