Commit a6fb08df authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

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: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 470fe1b5

include/net/bluetooth/bluetooth.h

+0 −1
Original line number Diff line number Diff line
@@ -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))

net/bluetooth/mgmt.c

+0 −2
Original line number Diff line number Diff line
@@ -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)