Skip to content

Commit

Permalink
Bluetooth: Use lmp_le_capable where applicable
Browse files Browse the repository at this point in the history
This patch replaces all LMP_LE bit checking by the helper macro
lmp_le_capable.

Signed-off-by: Andre Guedes <andre.guedes@openbossa.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
  • Loading branch information
Andre Guedes authored and Gustavo Padovan committed Aug 6, 2012
1 parent ed3fa31 commit c383ddc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions net/bluetooth/hci_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ static void hci_setup_event_mask(struct hci_dev *hdev)
* Features Notification */
}

if (hdev->features[4] & LMP_LE)
if (lmp_le_capable(hdev))
events[7] |= 0x20; /* LE Meta-Event */

hci_send_cmd(hdev, HCI_OP_SET_EVENT_MASK, sizeof(events), events);
Expand Down Expand Up @@ -746,7 +746,7 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev,
break;
}

if (test_bit(HCI_INIT, &hdev->flags) && hdev->features[4] & LMP_LE)
if (test_bit(HCI_INIT, &hdev->flags) && lmp_le_capable(hdev))
hci_set_le_support(hdev);

done:
Expand Down
4 changes: 2 additions & 2 deletions net/bluetooth/mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ static u32 get_supported_settings(struct hci_dev *hdev)
if (enable_hs)
settings |= MGMT_SETTING_HS;

if (hdev->features[4] & LMP_LE)
if (lmp_le_capable(hdev))
settings |= MGMT_SETTING_LE;

return settings;
Expand Down Expand Up @@ -1205,7 +1205,7 @@ static int set_le(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)

hci_dev_lock(hdev);

if (!(hdev->features[4] & LMP_LE)) {
if (!lmp_le_capable(hdev)) {
err = cmd_status(sk, hdev->id, MGMT_OP_SET_LE,
MGMT_STATUS_NOT_SUPPORTED);
goto unlock;
Expand Down

0 comments on commit c383ddc

Please sign in to comment.