net: bluetooth: compact struct bt_skb_cb by inlining struct hci_req_ctrl

struct hci_req_ctrl is never used outside of struct bt_skb_cb;
Inlining it frees 8 bytes on a 64 bit system in skb->cb[] allowing
the addition of more ancillary data.

Signed-off-by: Eyal Birger <eyal.birger@gmail.com>
Reviewed-by: Shmulik Ladkani <shmulik.ladkani@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 7 deletions

diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index e00455aab18c..09893668e6ea 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -275,21 +275,17 @@ struct hci_dev;
 
 typedef void (*hci_req_complete_t)(struct hci_dev *hdev, u8 status, u16 opcode);
 
-struct hci_req_ctrl {
-        bool                    start;
-        u8                      event;
-        hci_req_complete_t      complete;
-};
-
 struct bt_skb_cb {
         __u8 pkt_type;
         __u8 incoming;
         __u16 opcode;
         __u16 expect;
         __u8 force_active;
+        bool req_start;
+        u8 req_event;
+        hci_req_complete_t req_complete;
         struct l2cap_chan *chan;
         struct l2cap_ctrl control;
-        struct hci_req_ctrl req;
         bdaddr_t bdaddr;
         __le16 psm;
 };