Bluetooth: Use explicit header and body length for L2CAP SKB allocation

When allocating the L2CAP SKB for transmission, provide the upper layers
with a clear distinction on what is the header and what is the body
portion of the SKB.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 3dca28246cbe..ac2461442f21 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -2131,7 +2131,7 @@ static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan,
 
                 count = min_t(unsigned int, conn->mtu, len);
 
-                tmp = chan->ops->alloc_skb(chan, count,
+                tmp = chan->ops->alloc_skb(chan, 0, count,
                                            msg->msg_flags & MSG_DONTWAIT);
                 if (IS_ERR(tmp))
                         return PTR_ERR(tmp);
@@ -2166,7 +2166,7 @@ static struct sk_buff *l2cap_create_connless_pdu(struct l2cap_chan *chan,
 
         count = min_t(unsigned int, (conn->mtu - hlen), len);
 
-        skb = chan->ops->alloc_skb(chan, count + hlen,
+        skb = chan->ops->alloc_skb(chan, hlen, count,
                                    msg->msg_flags & MSG_DONTWAIT);
         if (IS_ERR(skb))
                 return skb;
@@ -2197,7 +2197,7 @@ static struct sk_buff *l2cap_create_basic_pdu(struct l2cap_chan *chan,
 
         count = min_t(unsigned int, (conn->mtu - L2CAP_HDR_SIZE), len);
 
-        skb = chan->ops->alloc_skb(chan, count + L2CAP_HDR_SIZE,
+        skb = chan->ops->alloc_skb(chan, L2CAP_HDR_SIZE, count,
                                    msg->msg_flags & MSG_DONTWAIT);
         if (IS_ERR(skb))
                 return skb;
@@ -2239,7 +2239,7 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct l2cap_chan *chan,
 
         count = min_t(unsigned int, (conn->mtu - hlen), len);
 
-        skb = chan->ops->alloc_skb(chan, count + hlen,
+        skb = chan->ops->alloc_skb(chan, hlen, count,
                                    msg->msg_flags & MSG_DONTWAIT);
         if (IS_ERR(skb))
                 return skb;
@@ -2360,7 +2360,7 @@ static struct sk_buff *l2cap_create_le_flowctl_pdu(struct l2cap_chan *chan,
 
         count = min_t(unsigned int, (conn->mtu - hlen), len);
 
-        skb = chan->ops->alloc_skb(chan, count + hlen,
+        skb = chan->ops->alloc_skb(chan, hlen, count,
                                    msg->msg_flags & MSG_DONTWAIT);
         if (IS_ERR(skb))
                 return skb;