diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2014-07-08 09:07:34 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-07-08 09:09:46 -0400 |
commit | 3742abfc4e853f9c926982d8d45be6ff010966ae (patch) | |
tree | 1951991f4d7548a25c4f5d87f8accd00c2a87394 /net/bluetooth/mgmt.c | |
parent | 23a48093b53999f8539144db1d9567964a84655c (diff) |
Bluetooth: Fix connectable and discoverable supported settings values
The connectable and discoverable mgmt settings are supported both for LE
and BR/EDR controllers so they do not belong behind a lmp_bredr_capable()
condition. This patch fixes the issue in get_supported_settings().
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/mgmt.c')
-rw-r--r-- | net/bluetooth/mgmt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index a4232bc237f3..376b164c5250 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -555,12 +555,12 @@ static u32 get_supported_settings(struct hci_dev *hdev) | |||
555 | settings |= MGMT_SETTING_POWERED; | 555 | settings |= MGMT_SETTING_POWERED; |
556 | settings |= MGMT_SETTING_PAIRABLE; | 556 | settings |= MGMT_SETTING_PAIRABLE; |
557 | settings |= MGMT_SETTING_DEBUG_KEYS; | 557 | settings |= MGMT_SETTING_DEBUG_KEYS; |
558 | settings |= MGMT_SETTING_CONNECTABLE; | ||
559 | settings |= MGMT_SETTING_DISCOVERABLE; | ||
558 | 560 | ||
559 | if (lmp_bredr_capable(hdev)) { | 561 | if (lmp_bredr_capable(hdev)) { |
560 | settings |= MGMT_SETTING_CONNECTABLE; | ||
561 | if (hdev->hci_ver >= BLUETOOTH_VER_1_2) | 562 | if (hdev->hci_ver >= BLUETOOTH_VER_1_2) |
562 | settings |= MGMT_SETTING_FAST_CONNECTABLE; | 563 | settings |= MGMT_SETTING_FAST_CONNECTABLE; |
563 | settings |= MGMT_SETTING_DISCOVERABLE; | ||
564 | settings |= MGMT_SETTING_BREDR; | 564 | settings |= MGMT_SETTING_BREDR; |
565 | settings |= MGMT_SETTING_LINK_SECURITY; | 565 | settings |= MGMT_SETTING_LINK_SECURITY; |
566 | 566 | ||