diff options
-rw-r--r-- | include/net/bluetooth/bluetooth.h | 1 | ||||
-rw-r--r-- | net/bluetooth/mgmt.c | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 5ca9219fe940..262ebd1747d4 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h | |||
@@ -222,7 +222,6 @@ struct bt_skb_cb { | |||
222 | __u16 tx_seq; | 222 | __u16 tx_seq; |
223 | __u8 retries; | 223 | __u8 retries; |
224 | __u8 sar; | 224 | __u8 sar; |
225 | unsigned short channel; | ||
226 | __u8 force_active; | 225 | __u8 force_active; |
227 | }; | 226 | }; |
228 | #define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb)) | 227 | #define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb)) |
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c index 1695d04d927d..bc71b45ef4e5 100644 --- 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, | |||
911 | if (!skb) | 911 | if (!skb) |
912 | return -ENOMEM; | 912 | return -ENOMEM; |
913 | 913 | ||
914 | bt_cb(skb)->channel = HCI_CHANNEL_CONTROL; | ||
915 | |||
916 | hdr = (void *) skb_put(skb, sizeof(*hdr)); | 914 | hdr = (void *) skb_put(skb, sizeof(*hdr)); |
917 | hdr->opcode = cpu_to_le16(event); | 915 | hdr->opcode = cpu_to_le16(event); |
918 | if (hdev) | 916 | if (hdev) |