aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>2012-02-06 08:04:01 -0500
committerJohan Hedberg <johan.hedberg@intel.com>2012-02-13 10:01:35 -0500
commit6d5922b01b5e8d684dae5baaea596a4a749738e3 (patch)
tree016c93f7ba63a41fc706b843b04ad23435bd96d4 /net
parent5491120e75afe2a7f5b6f3a207de6d99934e5475 (diff)
Bluetooth: Remove unneeded sk variable
In debug use chan %p instead of sk. 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>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap_core.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 48fc01ef16b6..f1a6b3cbdba7 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1561,13 +1561,12 @@ static struct sk_buff *l2cap_create_connless_pdu(struct l2cap_chan *chan,
1561 struct msghdr *msg, size_t len, 1561 struct msghdr *msg, size_t len,
1562 u32 priority) 1562 u32 priority)
1563{ 1563{
1564 struct sock *sk = chan->sk;
1565 struct l2cap_conn *conn = chan->conn; 1564 struct l2cap_conn *conn = chan->conn;
1566 struct sk_buff *skb; 1565 struct sk_buff *skb;
1567 int err, count, hlen = L2CAP_HDR_SIZE + L2CAP_PSMLEN_SIZE; 1566 int err, count, hlen = L2CAP_HDR_SIZE + L2CAP_PSMLEN_SIZE;
1568 struct l2cap_hdr *lh; 1567 struct l2cap_hdr *lh;
1569 1568
1570 BT_DBG("sk %p len %d priority %u", sk, (int)len, priority); 1569 BT_DBG("chan %p len %d priority %u", chan, (int)len, priority);
1571 1570
1572 count = min_t(unsigned int, (conn->mtu - hlen), len); 1571 count = min_t(unsigned int, (conn->mtu - hlen), len);
1573 1572
@@ -1597,13 +1596,12 @@ static struct sk_buff *l2cap_create_basic_pdu(struct l2cap_chan *chan,
1597 struct msghdr *msg, size_t len, 1596 struct msghdr *msg, size_t len,
1598 u32 priority) 1597 u32 priority)
1599{ 1598{
1600 struct sock *sk = chan->sk;
1601 struct l2cap_conn *conn = chan->conn; 1599 struct l2cap_conn *conn = chan->conn;
1602 struct sk_buff *skb; 1600 struct sk_buff *skb;
1603 int err, count, hlen = L2CAP_HDR_SIZE; 1601 int err, count, hlen = L2CAP_HDR_SIZE;
1604 struct l2cap_hdr *lh; 1602 struct l2cap_hdr *lh;
1605 1603
1606 BT_DBG("sk %p len %d", sk, (int)len); 1604 BT_DBG("chan %p len %d", chan, (int)len);
1607 1605
1608 count = min_t(unsigned int, (conn->mtu - hlen), len); 1606 count = min_t(unsigned int, (conn->mtu - hlen), len);
1609 1607
@@ -1632,13 +1630,12 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct l2cap_chan *chan,
1632 struct msghdr *msg, size_t len, 1630 struct msghdr *msg, size_t len,
1633 u32 control, u16 sdulen) 1631 u32 control, u16 sdulen)
1634{ 1632{
1635 struct sock *sk = chan->sk;
1636 struct l2cap_conn *conn = chan->conn; 1633 struct l2cap_conn *conn = chan->conn;
1637 struct sk_buff *skb; 1634 struct sk_buff *skb;
1638 int err, count, hlen; 1635 int err, count, hlen;
1639 struct l2cap_hdr *lh; 1636 struct l2cap_hdr *lh;
1640 1637
1641 BT_DBG("sk %p len %d", sk, (int)len); 1638 BT_DBG("chan %p len %d", chan, (int)len);
1642 1639
1643 if (!conn) 1640 if (!conn)
1644 return ERR_PTR(-ENOTCONN); 1641 return ERR_PTR(-ENOTCONN);