Commit a3451d27 authored by Johan Hedberg's avatar Johan Hedberg Committed by Marcel Holtmann

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: default avatarJohan Hedberg <johan.hedberg@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 55af49a8
...@@ -449,6 +449,7 @@ struct hci_conn_params { ...@@ -449,6 +449,7 @@ struct hci_conn_params {
enum { enum {
HCI_AUTO_CONN_DISABLED, HCI_AUTO_CONN_DISABLED,
HCI_AUTO_CONN_REPORT,
HCI_AUTO_CONN_ALWAYS, HCI_AUTO_CONN_ALWAYS,
HCI_AUTO_CONN_LINK_LOSS, HCI_AUTO_CONN_LINK_LOSS,
} auto_connect; } auto_connect;
......
...@@ -3547,6 +3547,7 @@ int hci_conn_params_set(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type, ...@@ -3547,6 +3547,7 @@ int hci_conn_params_set(struct hci_dev *hdev, bdaddr_t *addr, u8 addr_type,
switch (auto_connect) { switch (auto_connect) {
case HCI_AUTO_CONN_DISABLED: case HCI_AUTO_CONN_DISABLED:
case HCI_AUTO_CONN_REPORT:
case HCI_AUTO_CONN_LINK_LOSS: case HCI_AUTO_CONN_LINK_LOSS:
hci_pend_le_conn_del(hdev, addr, addr_type); hci_pend_le_conn_del(hdev, addr, addr_type);
break; break;
......
...@@ -5034,7 +5034,7 @@ static int add_device(struct sock *sk, struct hci_dev *hdev, ...@@ -5034,7 +5034,7 @@ static int add_device(struct sock *sk, struct hci_dev *hdev,
if (cp->action) if (cp->action)
auto_conn = HCI_AUTO_CONN_ALWAYS; auto_conn = HCI_AUTO_CONN_ALWAYS;
else else
auto_conn = HCI_AUTO_CONN_DISABLED; auto_conn = HCI_AUTO_CONN_REPORT;
/* If the connection parameters don't exist for this device, /* If the connection parameters don't exist for this device,
* they will be created and configured with defaults. * they will be created and configured with defaults.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment