Bluetooth: Create struct l2cap_chan

struct l2cap_chan cames to create a clear separation between what
properties and data belongs to the L2CAP channel and what belongs to the
socket. By now we just fold the struct sock * in struct l2cap_chan as all
the channel info is struct l2cap_pinfo today.

In the next commits we will see a move of channel stuff to struct
l2cap_chan.

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index f77308e63e58..7df81181a119 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -902,7 +902,7 @@ void __l2cap_sock_close(struct sock *sk, int reason)
                         l2cap_sock_set_timer(sk, sk->sk_sndtimeo);
                         l2cap_send_disconn_req(conn, sk, reason);
                 } else
-                        l2cap_chan_del(sk, reason);
+                        l2cap_chan_del(l2cap_pi(sk)->chan, reason);
                 break;
 
         case BT_CONNECT2:
@@ -925,12 +925,12 @@ void __l2cap_sock_close(struct sock *sk, int reason)
                                         L2CAP_CONN_RSP, sizeof(rsp), &rsp);
                 }
 
-                l2cap_chan_del(sk, reason);
+                l2cap_chan_del(l2cap_pi(sk)->chan, reason);
                 break;
 
         case BT_CONNECT:
         case BT_DISCONN:
-                l2cap_chan_del(sk, reason);
+                l2cap_chan_del(l2cap_pi(sk)->chan, reason);
                 break;
 
         default: