diff options
| author | Mursalin Akon <makon@nvidia.com> | 2012-11-29 14:33:57 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 12:44:00 -0700 |
| commit | 7b79e1f554bee5aacbc05b01ce2e71954f4251da (patch) | |
| tree | eda36ecdff19338f622765e081922e5a201e21aa /net/bluetooth | |
| parent | 03e9578b4fbd878475d8ab8b4660e09f721f5e97 (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>
Reviewed-on: http://git-master/r/167501
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Allen Martin <amartin@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'net/bluetooth')
| -rw-r--r-- | net/bluetooth/hci_conn.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index ab8510d47acb..1c24dcf17dd2 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -891,6 +891,7 @@ int hci_get_conn_list(void __user *arg) (ci + n)->out = c->out; (ci + n)->state = c->state; (ci + n)->link_mode = c->link_mode; +#ifdef CONFIG_ANDROID if (c->type == SCO_LINK) { (ci + n)->mtu = hdev->sco_mtu; (ci + n)->cnt = hdev->sco_cnt; @@ -900,6 +901,7 @@ int hci_get_conn_list(void __user *arg) (ci + n)->cnt = hdev->acl_cnt; (ci + n)->pkts = hdev->acl_pkts; } +#endif if (++n >= req.conn_num) break; } @@ -936,6 +938,7 @@ int hci_get_conn_info(struct hci_dev *hdev, void __user *arg) ci.out = conn->out; ci.state = conn->state; ci.link_mode = conn->link_mode; +#ifdef CONFIG_ANDROID if (req.type == SCO_LINK) { ci.mtu = hdev->sco_mtu; ci.cnt = hdev->sco_cnt; @@ -945,6 +948,7 @@ int hci_get_conn_info(struct hci_dev *hdev, void __user *arg) ci.cnt = hdev->acl_cnt; ci.pkts = hdev->acl_pkts; } +#endif } hci_dev_unlock(hdev); |