bluetooth: hid: make Android code conditional
Mursalin Akon [Thu, 29 Nov 2012 22:33:57 +0000 (14:33 -0800)]
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>

include/net/bluetooth/hci.h
net/bluetooth/hci_conn.c

index 915d7ae..14bee5a 100644 (file)
@@ -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 {
index 33c4e0c..46f2c18 100644 (file)
@@ -907,6 +907,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;
@@ -916,6 +917,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;
        }
@@ -952,6 +954,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;
@@ -961,6 +964,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_bh(hdev);