Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 327465
b: refs/heads/master
c: ed3fa31
h: refs/heads/master
i:
  327463: 6bbfe97
v: v3
  • Loading branch information
Andre Guedes authored and Gustavo Padovan committed Aug 6, 2012
1 parent 4c610ec commit 4c69068
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 78eb2f985c17eab34a0ef919b3263d6b08064e98
refs/heads/master: ed3fa31f35896b42c54333edabf0a9e986fa952c
4 changes: 2 additions & 2 deletions trunk/net/bluetooth/mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ static u32 get_supported_settings(struct hci_dev *hdev)
if (hdev->features[6] & LMP_SIMPLE_PAIR)
settings |= MGMT_SETTING_SSP;

if (!(hdev->features[4] & LMP_NO_BREDR)) {
if (lmp_bredr_capable(hdev)) {
settings |= MGMT_SETTING_BREDR;
settings |= MGMT_SETTING_LINK_SECURITY;
}
Expand Down Expand Up @@ -413,7 +413,7 @@ static u32 get_current_settings(struct hci_dev *hdev)
if (test_bit(HCI_PAIRABLE, &hdev->dev_flags))
settings |= MGMT_SETTING_PAIRABLE;

if (!(hdev->features[4] & LMP_NO_BREDR))
if (lmp_bredr_capable(hdev))
settings |= MGMT_SETTING_BREDR;

if (test_bit(HCI_LE_ENABLED, &hdev->dev_flags))
Expand Down

0 comments on commit 4c69068

Please sign in to comment.