diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-12 15:10:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-12 15:10:00 -0500 |
| commit | 9ee6045f09a7875ebe55b9942b232a19076b157b (patch) | |
| tree | 4c3924d35d99d413a95205ac21da8d369063234b /include/net | |
| parent | 3b09c84cb622ffbcdb5d541986b1eaf7d5812602 (diff) | |
| parent | 1140afa862842ac3e56678693050760edc4ecde9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index 5e2e98458496..ea9231f4935f 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
| @@ -127,7 +127,7 @@ struct hci_dev { | |||
| 127 | __u8 major_class; | 127 | __u8 major_class; |
| 128 | __u8 minor_class; | 128 | __u8 minor_class; |
| 129 | __u8 features[8]; | 129 | __u8 features[8]; |
| 130 | __u8 extfeatures[8]; | 130 | __u8 host_features[8]; |
| 131 | __u8 commands[64]; | 131 | __u8 commands[64]; |
| 132 | __u8 ssp_mode; | 132 | __u8 ssp_mode; |
| 133 | __u8 hci_ver; | 133 | __u8 hci_ver; |
| @@ -676,7 +676,7 @@ void hci_conn_del_sysfs(struct hci_conn *conn); | |||
| 676 | #define lmp_le_capable(dev) ((dev)->features[4] & LMP_LE) | 676 | #define lmp_le_capable(dev) ((dev)->features[4] & LMP_LE) |
| 677 | 677 | ||
| 678 | /* ----- Extended LMP capabilities ----- */ | 678 | /* ----- Extended LMP capabilities ----- */ |
| 679 | #define lmp_host_le_capable(dev) ((dev)->extfeatures[0] & LMP_HOST_LE) | 679 | #define lmp_host_le_capable(dev) ((dev)->host_features[0] & LMP_HOST_LE) |
| 680 | 680 | ||
| 681 | /* ----- HCI protocols ----- */ | 681 | /* ----- HCI protocols ----- */ |
| 682 | static inline int hci_proto_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, | 682 | static inline int hci_proto_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, |