Revert "Bluetooth: Add ACL MTU, available buffers and total buffers to hci_conn_info."

This reverts commit 7b75ff3c3f0b0014dd22c1db05ca916cd4b886e8.

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index b2d8a99e5177ba123b91730f015ba104ea2f5839..ed3aea1605e89b6955e402a8b7a71c97119f42e0 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -991,9 +991,6 @@ struct hci_conn_info {
        __u8     out;
        __u16    state;
        __u32    link_mode;
-       __u32    mtu;
-       __u32    cnt;
-       __u32    pkts;
 };
 
 struct hci_dev_req {

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 0cf25114a3f576fc2788a549eb96d0087dd39b44..b10e3cdb08f87358ca64d0db8cf83c27f5ad624a 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -639,15 +639,6 @@ 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;
-               if (c->type == SCO_LINK) {
-                       (ci + n)->mtu = hdev->sco_mtu;
-                       (ci + n)->cnt = hdev->sco_cnt;
-                       (ci + n)->pkts = hdev->sco_pkts;
-               } else {
-                       (ci + n)->mtu = hdev->acl_mtu;
-                       (ci + n)->cnt = hdev->acl_cnt;
-                       (ci + n)->pkts = hdev->acl_pkts;
-               }
                if (++n >= req.conn_num)
                        break;
        }
@@ -684,15 +675,6 @@ 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;
-               if (req.type == SCO_LINK) {
-                       ci.mtu = hdev->sco_mtu;
-                       ci.cnt = hdev->sco_cnt;
-                       ci.pkts = hdev->sco_pkts;
-               } else {
-                       ci.mtu = hdev->acl_mtu;
-                       ci.cnt = hdev->acl_cnt;
-                       ci.pkts = hdev->acl_pkts;
-               }
        }
        hci_dev_unlock_bh(hdev);