Skip to content

Commit

Permalink
Bluetooth: Remove unneeded bt_cb(skb)->channel variable
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Marcel Holtmann authored and Johan Hedberg committed Feb 20, 2012
1 parent 470fe1b commit a6fb08d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 3 deletions.
1 change: 0 additions & 1 deletion include/net/bluetooth/bluetooth.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 0 additions & 2 deletions net/bluetooth/mgmt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit a6fb08d

Please sign in to comment.