]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
Bluetooth: Remove interval parameter from HCI connection
authorMarcel Holtmann <marcel@holtmann.org>
Sat, 19 Oct 2013 12:26:57 +0000 (05:26 -0700)
committerJohan Hedberg <johan.hedberg@intel.com>
Sat, 19 Oct 2013 13:50:05 +0000 (16:50 +0300)
The conn->interval parameter of HCI connections is not used at all
and so just remove it.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
include/net/bluetooth/hci_core.h
net/bluetooth/hci_event.c

index 0daac39c1b6e53924d8dc4bd00c9bcc12ad95461..c689bcf4a0f7234d0a3fea20612800e789151ad2 100644 (file)
@@ -315,7 +315,6 @@ struct hci_conn {
        __u8            attempt;
        __u8            dev_class[3];
        __u8            features[HCI_MAX_PAGES][8];
-       __u16           interval;
        __u16           pkt_type;
        __u16           link_policy;
        __u32           link_mode;
index 848045223e98db9aff82ece595ce6ab0a964bb36..1214d4b6f5413956f79d174a16e43d0fa20a9d45 100644 (file)
@@ -2549,7 +2549,6 @@ static void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
        conn = hci_conn_hash_lookup_handle(hdev, __le16_to_cpu(ev->handle));
        if (conn) {
                conn->mode = ev->mode;
-               conn->interval = __le16_to_cpu(ev->interval);
 
                if (!test_and_clear_bit(HCI_CONN_MODE_CHANGE_PEND,
                                        &conn->flags)) {