diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2015-03-30 23:21:01 +0300 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2015-03-30 23:20:53 +0200 |
| commit | a4368ff3ed3b57e4b5e36d83b75604f68bbcdaad (patch) | |
| tree | fadfd6e1b967980891816b1773cf871afebe4065 /include/net/bluetooth | |
| parent | 20fa110a54d8070a7d68fb44a6c0ea2d8b09fddc (diff) | |
| download | blackbird-obmc-linux-a4368ff3ed3b57e4b5e36d83b75604f68bbcdaad.tar.gz blackbird-obmc-linux-a4368ff3ed3b57e4b5e36d83b75604f68bbcdaad.zip | |
Bluetooth: Refactor L2CAP variables into l2cap_ctrl
We're getting very close to the maximum possible size of bt_skb_cb. To
prepare to shrink the struct with the help of a union this patch moves
all L2CAP related variables into the l2cap_ctrl struct. To later add
other 'ctrl' structs the L2CAP one is renamed simple 'l2cap' instead
of 'control'.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include/net/bluetooth')
| -rw-r--r-- | include/net/bluetooth/bluetooth.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 33a5e00025aa..d8367cc7c76e 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h @@ -269,6 +269,9 @@ struct l2cap_ctrl { __u16 reqseq; __u16 txseq; __u8 retries; + __le16 psm; + bdaddr_t bdaddr; + struct l2cap_chan *chan; }; struct hci_dev; @@ -284,10 +287,7 @@ struct bt_skb_cb { __u8 req_start:1; u8 req_event; hci_req_complete_t req_complete; - struct l2cap_chan *chan; - struct l2cap_ctrl control; - bdaddr_t bdaddr; - __le16 psm; + struct l2cap_ctrl l2cap; }; #define bt_cb(skb) ((struct bt_skb_cb *)((skb)->cb)) |
