diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2012-02-20 14:50:31 +0100 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-02-20 15:55:37 +0200 |
| commit | a6fb08dfe8654e399c9bbca34be914e213560b5e (patch) | |
| tree | 15165238e6d8193a36ccac71b642836b8dfff76a | |
| parent | 470fe1b540fb50ba8ce01e0ac985602e8fbb108c (diff) | |
| download | linux-3.10-a6fb08dfe8654e399c9bbca34be914e213560b5e.tar.gz linux-3.10-a6fb08dfe8654e399c9bbca34be914e213560b5e.tar.bz2 linux-3.10-a6fb08dfe8654e399c9bbca34be914e213560b5e.zip | |
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>
| -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 5ca9219fe94..262ebd1747d 100644 --- 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 1695d04d927..bc71b45ef4e 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, 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) |