浏览代码

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>
Andrei Emeltchenko 13 年之前
父节点
当前提交
6d5922b01b
共有 1 个文件被更改,包括 3 次插入6 次删除
  1. 3 6
      net/bluetooth/l2cap_core.c

+ 3 - 6
net/bluetooth/l2cap_core.c

@@ -1561,13 +1561,12 @@ static struct sk_buff *l2cap_create_connless_pdu(struct l2cap_chan *chan,
 						struct msghdr *msg, size_t len,
 						struct msghdr *msg, size_t len,
 						u32 priority)
 						u32 priority)
 {
 {
-	struct sock *sk = chan->sk;
 	struct l2cap_conn *conn = chan->conn;
 	struct l2cap_conn *conn = chan->conn;
 	struct sk_buff *skb;
 	struct sk_buff *skb;
 	int err, count, hlen = L2CAP_HDR_SIZE + L2CAP_PSMLEN_SIZE;
 	int err, count, hlen = L2CAP_HDR_SIZE + L2CAP_PSMLEN_SIZE;
 	struct l2cap_hdr *lh;
 	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);
 	count = min_t(unsigned int, (conn->mtu - hlen), len);
 
 
@@ -1597,13 +1596,12 @@ static struct sk_buff *l2cap_create_basic_pdu(struct l2cap_chan *chan,
 						struct msghdr *msg, size_t len,
 						struct msghdr *msg, size_t len,
 						u32 priority)
 						u32 priority)
 {
 {
-	struct sock *sk = chan->sk;
 	struct l2cap_conn *conn = chan->conn;
 	struct l2cap_conn *conn = chan->conn;
 	struct sk_buff *skb;
 	struct sk_buff *skb;
 	int err, count, hlen = L2CAP_HDR_SIZE;
 	int err, count, hlen = L2CAP_HDR_SIZE;
 	struct l2cap_hdr *lh;
 	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);
 	count = min_t(unsigned int, (conn->mtu - hlen), len);
 
 
@@ -1632,13 +1630,12 @@ static struct sk_buff *l2cap_create_iframe_pdu(struct l2cap_chan *chan,
 						struct msghdr *msg, size_t len,
 						struct msghdr *msg, size_t len,
 						u32 control, u16 sdulen)
 						u32 control, u16 sdulen)
 {
 {
-	struct sock *sk = chan->sk;
 	struct l2cap_conn *conn = chan->conn;
 	struct l2cap_conn *conn = chan->conn;
 	struct sk_buff *skb;
 	struct sk_buff *skb;
 	int err, count, hlen;
 	int err, count, hlen;
 	struct l2cap_hdr *lh;
 	struct l2cap_hdr *lh;
 
 
-	BT_DBG("sk %p len %d", sk, (int)len);
+	BT_DBG("chan %p len %d", chan, (int)len);
 
 
 	if (!conn)
 	if (!conn)
 		return ERR_PTR(-ENOTCONN);
 		return ERR_PTR(-ENOTCONN);