Thread (15 messages) flat view 15 messages, 2 authors, 2012-01-31

Re: [RFCv0 4/5] Bluetooth: Remove unneeded sk variable

From: Ulisses Furquim <hidden>
Date: 2012-01-30 17:26:43

Hi Andrei,

On Mon, Jan 30, 2012 at 1:09 PM, Emeltchenko Andrei
[off-list ref] wrote:
quoted hunk ↗ jump to hunk
From: Andrei Emeltchenko <redacted>

In debug use chan %p instead of sk.

Signed-off-by: Andrei Emeltchenko <redacted>
---
 net/bluetooth/l2cap_core.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index a7e5a55..4a22602 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1589,13 +1589,12 @@ static struct sk_buff *l2cap_create_connless_pdu(struct l2cap_chan *chan,
                                               struct msghdr *msg, size_t len,
                                               u32 priority)
 {
-       struct sock *sk = chan->sk;
       struct l2cap_conn *conn = chan->conn;
       struct sk_buff *skb;
       int err, count, hlen = L2CAP_HDR_SIZE + L2CAP_PSMLEN_SIZE;
       struct l2cap_hdr *lh;

-       BT_DBG("sk %p len %d priority %u", sk, (int)len, priority);
+       BT_DBG("chan %p len %d priority %u", chan, (int)len, priority);

       count = min_t(unsigned int, (conn->mtu - hlen), len);
@@ -1625,13 +1624,12 @@ static struct sk_buff *l2cap_create_basic_pdu(struct l2cap_chan *chan,
                                               struct msghdr *msg, size_t len,
                                               u32 priority)
 {
-       struct sock *sk = chan->sk;
       struct l2cap_conn *conn = chan->conn;
       struct sk_buff *skb;
       int err, count, hlen = L2CAP_HDR_SIZE;
       struct l2cap_hdr *lh;

-       BT_DBG("sk %p len %d", sk, (int)len);
+       BT_DBG("chan %p len %d", chan, (int)len);

       count = min_t(unsigned int, (conn->mtu - hlen), len);
@@ -1660,13 +1658,12 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct l2cap_chan *chan,
                                               struct msghdr *msg, size_t len,
                                               u32 control, u16 sdulen)
 {
-       struct sock *sk = chan->sk;
       struct l2cap_conn *conn = chan->conn;
       struct sk_buff *skb;
       int err, count, hlen;
       struct l2cap_hdr *lh;

-       BT_DBG("sk %p len %d", sk, (int)len);
+       BT_DBG("chan %p len %d", chan, (int)len);

       if (!conn)
               return ERR_PTR(-ENOTCONN);
This one looks good to me.

Regards,

-- 
Ulisses Furquim
ProFUSION embedded systems
http://profusion.mobi
Mobile: +55 19 9250 0942
Skype: ulissesffs
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help