Commit aefedc1a authored Mar 15, 2015 by Marcel Holtmann Committed by Johan Hedberg Mar 16, 2015

Bluetooth: Remove unneeded HCI_CONN_REMOTE_OOB connection flag



The HCI_CONN_REMOTE_OOB connection flag is used to indicate if the
pairing initiator has provided out-of-band data. However since that
value is no longer used in any decision making, just remove it.

It is actually unclear what purpose the OOB data present field from
the HCI IO Capability Response event serves in the first place. If
either side provided out-of-band data, then that data will be used
for pairing.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

parent 455c2ff0

include/net/bluetooth/hci_core.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -596,7 +596,6 @@ enum {
		HCI_CONN_SC_ENABLED,
		HCI_CONN_AES_CCM,
		HCI_CONN_POWER_SAVE,
		HCI_CONN_REMOTE_OOB,
		HCI_CONN_FLUSH_KEY,
		HCI_CONN_ENCRYPT,
		HCI_CONN_AUTH,

net/bluetooth/hci_event.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -4006,8 +4006,6 @@ static void hci_io_capa_reply_evt(struct hci_dev hdev, struct sk_buff skb)

		conn->remote_cap = ev->capability;
		conn->remote_auth = ev->authentication;
		if (ev->oob_data)
		set_bit(HCI_CONN_REMOTE_OOB, &conn->flags);

		unlock:
		hci_dev_unlock(hdev);

Admin message