diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-05-16 18:23:24 -0300 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-06-13 14:55:33 -0300 |
| commit | ba3bd0ee3946d9300512e685e8d5573dfa10c060 (patch) | |
| tree | 73bf8ee0b2c9aede60e3ccb52968cd253027d399 /net/bluetooth/l2cap_sock.c | |
| parent | 230704942283cb3990584ddd6955ac8decfa6a2c (diff) | |
| download | linux-3.10-ba3bd0ee3946d9300512e685e8d5573dfa10c060.tar.gz linux-3.10-ba3bd0ee3946d9300512e685e8d5573dfa10c060.tar.bz2 linux-3.10-ba3bd0ee3946d9300512e685e8d5573dfa10c060.zip | |
Bluetooth: add close() callback to l2cap_chan_ops
close() calls l2cap_sock_kill() on l2cap_sock.c
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 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 28cdc7e6df5..9f15a164993 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -713,7 +713,7 @@ static int l2cap_sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct ms /* Kill socket (only if zapped and orphan) * Must be called on unlocked socket. */ -void l2cap_sock_kill(struct sock *sk) +static void l2cap_sock_kill(struct sock *sk) { if (!sock_flag(sk, SOCK_ZAPPED) || sk->sk_socket) return; @@ -796,10 +796,18 @@ static int l2cap_sock_recv_cb(void *data, struct sk_buff *skb) return sock_queue_rcv_skb(sk, skb); } +static void l2cap_sock_close_cb(void *data) +{ + struct sock *sk = data; + + l2cap_sock_kill(sk); +} + static struct l2cap_ops l2cap_chan_ops = { .name = "L2CAP Socket Interface", .new_connection = l2cap_sock_new_connection_cb, .recv = l2cap_sock_recv_cb, + .close = l2cap_sock_close_cb, }; static void l2cap_sock_destruct(struct sock *sk) |