diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-12 21:10:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-12 21:10:00 +0100 |
| commit | 9ee6045f09a7875ebe55b9942b232a19076b157b (patch) | |
| tree | 4c3924d35d99d413a95205ac21da8d369063234b /include | |
| parent | inet_diag: Rename inet_diag_req_compat into inet_diag_req (diff) | |
| parent | mac80211: fix rx->key NULL pointer dereference in promiscuous mode (diff) | |
| download | linux-9ee6045f09a7875ebe55b9942b232a19076b157b.tar.xz linux-9ee6045f09a7875ebe55b9942b232a19076b157b.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'include')
| -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 { __u8 major_class; __u8 minor_class; __u8 features[8]; - __u8 extfeatures[8]; + __u8 host_features[8]; __u8 commands[64]; __u8 ssp_mode; __u8 hci_ver; @@ -676,7 +676,7 @@ void hci_conn_del_sysfs(struct hci_conn *conn); #define lmp_le_capable(dev) ((dev)->features[4] & LMP_LE) /* ----- Extended LMP capabilities ----- */ -#define lmp_host_le_capable(dev) ((dev)->extfeatures[0] & LMP_HOST_LE) +#define lmp_host_le_capable(dev) ((dev)->host_features[0] & LMP_HOST_LE) /* ----- HCI protocols ----- */ static inline int hci_proto_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, |