diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-03-25 13:59:37 -0300 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-07 18:06:26 -0300 |
| commit | fc7f8a7ed4543853a99852ca405ea71fabe78946 (patch) | |
| tree | ba641dfeaca9eda1b2907f7c9c1d5af8eff34cd2 /net/bluetooth/l2cap_sock.c | |
| parent | 820ffdb3d25f74fbd553453f461709d52dfa72a2 (diff) | |
| download | kernel_samsung_smdk4412-fc7f8a7ed4543853a99852ca405ea71fabe78946.zip kernel_samsung_smdk4412-fc7f8a7ed4543853a99852ca405ea71fabe78946.tar.gz kernel_samsung_smdk4412-fc7f8a7ed4543853a99852ca405ea71fabe78946.tar.bz2 | |
Bluetooth: Move ident to struct l2cap_chan
ident is chan property, no need to reside on socket.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 7df8118..cad4bc7 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -818,7 +818,7 @@ static int l2cap_sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct ms rsp.dcid = cpu_to_le16(l2cap_pi(sk)->scid); rsp.result = cpu_to_le16(L2CAP_CR_SUCCESS); rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO); - l2cap_send_cmd(l2cap_pi(sk)->conn, l2cap_pi(sk)->ident, + l2cap_send_cmd(l2cap_pi(sk)->conn, l2cap_pi(sk)->chan->ident, L2CAP_CONN_RSP, sizeof(rsp), &rsp); if (l2cap_pi(sk)->conf_state & L2CAP_CONF_REQ_SENT) { @@ -921,7 +921,7 @@ void __l2cap_sock_close(struct sock *sk, int reason) rsp.dcid = cpu_to_le16(l2cap_pi(sk)->scid); rsp.result = cpu_to_le16(result); rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO); - l2cap_send_cmd(conn, l2cap_pi(sk)->ident, + l2cap_send_cmd(conn, l2cap_pi(sk)->chan->ident, L2CAP_CONN_RSP, sizeof(rsp), &rsp); } |