Bluetooth: Remove unneeded bt_cb(skb)->channel variable

The bt_cb(skb)->channel was only needed to make hci_send_to_sock() be
used for HCI raw and control sockets. Since they have now separate sending
functions this is no longer needed.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 5ca9219fe940bca026ffd32a887acff9ff4adb80..262ebd1747d4d2d0121f20a5114741d48c8a48fe 100644 (file)
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -222,7 +222,6 @@ struct bt_skb_cb {
        __u16 tx_seq;
        __u8 retries;
        __u8 sar;
-       unsigned short channel;
        __u8 force_active;
 };
 #define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb))

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 1695d04d927d3291cde81ef9a0c200b2daf6467f..bc71b45ef4e5fd09d7044a6df892ea7d3d74d27a 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -911,8 +911,6 @@ static int mgmt_event(u16 event, struct hci_dev *hdev, void *data,
        if (!skb)
                return -ENOMEM;
 
-       bt_cb(skb)->channel = HCI_CHANNEL_CONTROL;
-
        hdr = (void *) skb_put(skb, sizeof(*hdr));
        hdr->opcode = cpu_to_le16(event);
        if (hdev)