aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorArman Uguray <armansito@chromium.org>2015-03-25 21:53:42 -0400
committerMarcel Holtmann <marcel@holtmann.org>2015-03-25 22:30:29 -0400
commit807ec772bf484a8e93bc9a2a681e49cb8f2c4d69 (patch)
tree04d325f98922a6609d82806ed2e71a1fb71dca8f /net
parentb44133ff03be30b55f23036e62f403a3f7784fce (diff)
Bluetooth: Support the "limited-discoverable" adv flag
This patch adds support for the "limited-discoverable" flag of the Add Advertising command. Signed-off-by: Arman Uguray <armansito@chromium.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/mgmt.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index c1804527fa3b..797cf6cf958f 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -977,9 +977,15 @@ static u8 create_instance_adv_data(struct hci_dev *hdev, u8 *ptr)
977{ 977{
978 u8 ad_len = 0, flags = 0; 978 u8 ad_len = 0, flags = 0;
979 979
980 /* The Add Advertising command allows userspace to set both the general
981 * and limited discoverable flags.
982 */
980 if (hdev->adv_instance.flags & MGMT_ADV_FLAG_DISCOV) 983 if (hdev->adv_instance.flags & MGMT_ADV_FLAG_DISCOV)
981 flags |= LE_AD_GENERAL; 984 flags |= LE_AD_GENERAL;
982 985
986 if (hdev->adv_instance.flags & MGMT_ADV_FLAG_LIMITED_DISCOV)
987 flags |= LE_AD_LIMITED;
988
983 if (flags) { 989 if (flags) {
984 if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED)) 990 if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED))
985 flags |= LE_AD_NO_BREDR; 991 flags |= LE_AD_NO_BREDR;
@@ -6576,8 +6582,9 @@ static bool tlv_data_is_valid(struct hci_dev *hdev, u32 adv_flags, u8 *data,
6576 u8 max_len = HCI_MAX_AD_LENGTH; 6582 u8 max_len = HCI_MAX_AD_LENGTH;
6577 int i, cur_len; 6583 int i, cur_len;
6578 bool flags_managed = false; 6584 bool flags_managed = false;
6585 u32 flags_params = MGMT_ADV_FLAG_DISCOV | MGMT_ADV_FLAG_LIMITED_DISCOV;
6579 6586
6580 if (is_adv_data && (adv_flags & MGMT_ADV_FLAG_DISCOV)) { 6587 if (is_adv_data && (adv_flags & flags_params)) {
6581 flags_managed = true; 6588 flags_managed = true;
6582 max_len -= 3; 6589 max_len -= 3;
6583 } 6590 }