Commit a3451d27 authored Jul 02, 2014 by Johan Hedberg Committed by Marcel Holtmann Jul 03, 2014

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>

parent 55af49a8

include/net/bluetooth/hci_core.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -449,6 +449,7 @@ struct hci_conn_params {

		enum {
		HCI_AUTO_CONN_DISABLED,
		HCI_AUTO_CONN_REPORT,
		HCI_AUTO_CONN_ALWAYS,
		HCI_AUTO_CONN_LINK_LOSS,
		} auto_connect;

net/bluetooth/hci_core.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;

net/bluetooth/mgmt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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.