aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2016-03-09 17:30:33 +0200
committerMarcel Holtmann <marcel@holtmann.org>2016-03-10 19:51:29 +0100
commitd43efbd0d545f476be0bbef30cbe18234f8a9631 (patch)
treef839fb6a9c7e6677e12156c1b4c8334fac266500 /net
parentBluetooth: Move memset closer to where it's needed (diff)
downloadlinux-dev-d43efbd0d545f476be0bbef30cbe18234f8a9631.tar.xz
linux-dev-d43efbd0d545f476be0bbef30cbe18234f8a9631.zip
Bluetooth: Fix adding discoverable to adv instance flags
When lookup up the advertising instance flags for the default advertising instance (0) the discoverable flag should be filled in based on the HCI_DISCOVERABLE flag. 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_request.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
index c78ee2dc9323..77be344efd18 100644
--- a/net/bluetooth/hci_request.c
+++ b/net/bluetooth/hci_request.c
@@ -866,6 +866,9 @@ static u32 get_adv_instance_flags(struct hci_dev *hdev, u8 instance)
if (hci_dev_test_flag(hdev, HCI_ADVERTISING_CONNECTABLE))
flags |= MGMT_ADV_FLAG_CONNECTABLE;
+ if (hci_dev_test_flag(hdev, HCI_DISCOVERABLE))
+ flags |= MGMT_ADV_FLAG_DISCOV;
+
return flags;
}