Bluetooth: Add alloc_skb chan operator

Add channel-specific skb allocation method

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

diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 238daf84184c378594fff9d302af2aa3c3919555..e7a8cc7d07f4b285858aa40f06832305de620922 100644 (file)
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -506,6 +506,9 @@ struct l2cap_ops {
        int                     (*recv) (void *data, struct sk_buff *skb);
        void                    (*close) (void *data);
        void                    (*state_change) (void *data, int state);
+       struct sk_buff          *(*alloc_skb) (struct l2cap_chan *chan,
+                                       unsigned long len, int nb, int *err);
+
 };
 
 struct l2cap_conn {

diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index cba1f683b6498df6848802851dbbd19700183b0b..b2f52f87b98ea5aea17817cd95e6cb42a2d3741a 100644 (file)
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1520,7 +1520,6 @@ static void l2cap_send_srejtail(struct l2cap_chan *chan)
 
 static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan, struct msghdr *msg, int len, int count, struct sk_buff *skb)
 {
-       struct sock *sk = chan->sk;
        struct l2cap_conn *conn = chan->conn;
        struct sk_buff **frag;
        int err, sent = 0;
@@ -1536,7 +1535,9 @@ static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan, struct msghdr
        while (len) {
                count = min_t(unsigned int, conn->mtu, len);
 
-               *frag = bt_skb_send_alloc(sk, count, msg->msg_flags & MSG_DONTWAIT, &err);
+               *frag = chan->ops->alloc_skb(chan, count,
+                                       msg->msg_flags & MSG_DONTWAIT, &err);
+
                if (!*frag)
                        return err;
                if (memcpy_fromiovec(skb_put(*frag, count), msg->msg_iov, count))
@@ -1566,8 +1567,10 @@ static struct sk_buff *l2cap_create_connless_pdu(struct l2cap_chan *chan,
        BT_DBG("sk %p len %d priority %u", sk, (int)len, priority);
 
        count = min_t(unsigned int, (conn->mtu - hlen), len);
-       skb = bt_skb_send_alloc(sk, count + hlen,
-                       msg->msg_flags & MSG_DONTWAIT, &err);
+
+       skb = chan->ops->alloc_skb(chan, count + hlen,
+                                       msg->msg_flags & MSG_DONTWAIT, &err);
+
        if (!skb)
                return ERR_PTR(err);
 
@@ -1600,8 +1603,10 @@ static struct sk_buff *l2cap_create_basic_pdu(struct l2cap_chan *chan,
        BT_DBG("sk %p len %d", sk, (int)len);
 
        count = min_t(unsigned int, (conn->mtu - hlen), len);
-       skb = bt_skb_send_alloc(sk, count + hlen,
-                       msg->msg_flags & MSG_DONTWAIT, &err);
+
+       skb = chan->ops->alloc_skb(chan, count + hlen,
+                                       msg->msg_flags & MSG_DONTWAIT, &err);
+
        if (!skb)
                return ERR_PTR(err);
 
@@ -1647,8 +1652,10 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct l2cap_chan *chan,
                hlen += L2CAP_FCS_SIZE;
 
        count = min_t(unsigned int, (conn->mtu - hlen), len);
-       skb = bt_skb_send_alloc(sk, count + hlen,
-                       msg->msg_flags & MSG_DONTWAIT, &err);
+
+       skb = chan->ops->alloc_skb(chan, count + hlen,
+                                       msg->msg_flags & MSG_DONTWAIT, &err);
+
        if (!skb)
                return ERR_PTR(err);
 

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 401d9428ae4c824f6dbe2871d77bb6742ba4688c..16360298590f0bc46905e2d7aec45d8aa73120b2 100644 (file)
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -899,12 +899,21 @@ static void l2cap_sock_state_change_cb(void *data, int state)
        sk->sk_state = state;
 }
 
+static struct sk_buff *l2cap_sock_alloc_skb_cb(struct l2cap_chan *chan,
+                                       unsigned long len, int nb, int *err)
+{
+       struct sock *sk = chan->sk;
+
+       return bt_skb_send_alloc(sk, len, nb, err);
+}
+
 static struct l2cap_ops l2cap_chan_ops = {
        .name           = "L2CAP Socket Interface",
        .new_connection = l2cap_sock_new_connection_cb,
        .recv           = l2cap_sock_recv_cb,
        .close          = l2cap_sock_close_cb,
        .state_change   = l2cap_sock_state_change_cb,
+       .alloc_skb      = l2cap_sock_alloc_skb_cb,
 };
 
 static void l2cap_sock_destruct(struct sock *sk)