aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2015-03-15 20:08:19 -0400
committerJohan Hedberg <johan.hedberg@intel.com>2015-03-16 00:53:43 -0400
commitaefedc1a4cfe4c874b8a7ac743f9deedc289d9e6 (patch)
tree24525fa415c41a828093b43a86ea69c0dfc4ff28 /net/bluetooth
parent455c2ff0a558c04d53a2f5bb55d16093a7dee41d (diff)
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>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_event.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 10d760c46df1..d800f0c5aa21 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -4006,8 +4006,6 @@ static void hci_io_capa_reply_evt(struct hci_dev *hdev, struct sk_buff *skb)
4006 4006
4007 conn->remote_cap = ev->capability; 4007 conn->remote_cap = ev->capability;
4008 conn->remote_auth = ev->authentication; 4008 conn->remote_auth = ev->authentication;
4009 if (ev->oob_data)
4010 set_bit(HCI_CONN_REMOTE_OOB, &conn->flags);
4011 4009
4012unlock: 4010unlock:
4013 hci_dev_unlock(hdev); 4011 hci_dev_unlock(hdev);