diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-01-10 15:44:17 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-10 15:44:17 -0500 |
| commit | 874c60bad92564358e87d58f505fceb0b09ec1aa (patch) | |
| tree | f6a5cadf50e07971f711b6cdf627797c5e1c095b /include/net | |
| parent | a8c1f65c79cbbb2f7da782d4c9d15639a9b94b27 (diff) | |
| parent | c5993de864d96b3656e9fca38c377b130105d97a (diff) | |
| download | kernel_goldelico_gta04-874c60bad92564358e87d58f505fceb0b09ec1aa.zip kernel_goldelico_gta04-874c60bad92564358e87d58f505fceb0b09ec1aa.tar.gz kernel_goldelico_gta04-874c60bad92564358e87d58f505fceb0b09ec1aa.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next
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 5e2e984..ea9231f 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, |