diff options
| author | Mursalin Akon <makon@nvidia.com> | 2012-11-29 14:33:57 -0800 |
|---|---|---|
| committer | Matthew Pedro <mapedro@nvidia.com> | 2012-12-04 12:16:47 -0800 |
| commit | 8024dfe1ac9035050c3402ceef52475dd59f3237 (patch) | |
| tree | 927991d40257a9fb7859c69e8c742d7b8c84228c /include | |
| parent | 4c7f1b3304a4effbccd7ba6d4c12c0275fbf73d1 (diff) | |
bluetooth: hid: make Android code conditional
Commit 7c786ce33a1b4194cb95aa1e68bc38d552eda932
introduced couple of fields, which are not used
in standard bluez user space stack. However,
Android bluez use them. This CL, conditionally
builds the part of the code introduced in the
above commit.
Bug 1178960
Change-Id: I7254fe83c7fb4bbfd14e00dda3ec3a14afc1b234
Signed-off-by: Mursalin Akon <makon@nvidia.com>
(cherry picked from commit e3375fd96fa5e0d7cfcda848d797cd512c12b7a6)
Reviewed-on: http://git-master/r/167540
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Eric Brower <ebrower@nvidia.com>
Reviewed-by: Matthew Pedro <mapedro@nvidia.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/bluetooth/hci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 915d7ae527b3..14bee5ade7c7 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h @@ -1264,9 +1264,11 @@ struct hci_conn_info { __u8 out; __u16 state; __u32 link_mode; +#ifdef CONFIG_ANDROID __u32 mtu; __u32 cnt; __u32 pkts; +#endif }; struct hci_dev_req { |