diff options
author | Andre Guedes <aguedespe@gmail.com> | 2011-12-30 08:34:03 -0500 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2012-01-02 19:21:05 -0500 |
commit | 59e294065ddee7074af91e4f5e12e6095eb1135b (patch) | |
tree | 7f97a5890a4c65f8289a9b5162503e682b2f57f7 /net/bluetooth | |
parent | 94f5bfb8c1641080c3c4325714b8fe7d2839a906 (diff) |
Bluetooth: Rename extfeatures
This patch renames hdev->extfeatures to hdev->host_features since it
holds the extended features Page 1 (aka host features).
Signed-off-by: Andre Guedes <aguedespe@gmail.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/hci_event.c | 2 | ||||
-rw-r--r-- | net/bluetooth/mgmt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 919e3c0e74aa..37c31c52880c 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c | |||
@@ -711,7 +711,7 @@ static void hci_cc_read_local_ext_features(struct hci_dev *hdev, | |||
711 | if (rp->status) | 711 | if (rp->status) |
712 | return; | 712 | return; |
713 | 713 | ||
714 | memcpy(hdev->extfeatures, rp->features, 8); | 714 | memcpy(hdev->host_features, rp->features, 8); |
715 | 715 | ||
716 | hci_req_complete(hdev, HCI_OP_READ_LOCAL_EXT_FEATURES, rp->status); | 716 | hci_req_complete(hdev, HCI_OP_READ_LOCAL_EXT_FEATURES, rp->status); |
717 | } | 717 | } |
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 2540944d871f..38ec8ca72175 100644 --- a/net/bluetooth/mgmt.c +++ b/net/bluetooth/mgmt.c | |||
@@ -291,7 +291,7 @@ static u32 get_current_settings(struct hci_dev *hdev) | |||
291 | if (!(hdev->features[4] & LMP_NO_BREDR)) | 291 | if (!(hdev->features[4] & LMP_NO_BREDR)) |
292 | settings |= MGMT_SETTING_BREDR; | 292 | settings |= MGMT_SETTING_BREDR; |
293 | 293 | ||
294 | if (hdev->extfeatures[0] & LMP_HOST_LE) | 294 | if (hdev->host_features[0] & LMP_HOST_LE) |
295 | settings |= MGMT_SETTING_LE; | 295 | settings |= MGMT_SETTING_LE; |
296 | 296 | ||
297 | if (test_bit(HCI_AUTH, &hdev->flags)) | 297 | if (test_bit(HCI_AUTH, &hdev->flags)) |