diff options
author | Gustavo F. Padovan | 2011-05-05 00:35:27 +0200 |
---|---|---|
committer | Gustavo F. Padovan | 2011-06-08 21:58:16 +0200 |
commit | 500698d3fd987f6c405d6d5f68fdf535a539e71e (patch) | |
tree | 458c7da09d366e37f133ef131b56e8dbdb6c2211 /include/net | |
parent | Bluetooth: create channel timer to replace sk_timer (diff) | |
download | kernel-qcow2-linux-500698d3fd987f6c405d6d5f68fdf535a539e71e.tar.gz kernel-qcow2-linux-500698d3fd987f6c405d6d5f68fdf535a539e71e.tar.xz kernel-qcow2-linux-500698d3fd987f6c405d6d5f68fdf535a539e71e.zip |
Bluetooth: Remove export of l2cap_chan_clear_timer()
The call to l2cap_chan_clear_timer() is not really needed in l2cap_sock.c.
This patch also adds a call to l2cap_chan_clear_timer() to the only place
in __l2cap_sock_close() that wasn't calling it. It's safe call it there
because l2cap_chan_clear_timer() check first for timer_peding().
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/bluetooth/l2cap.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index efb1fc4f3a03..1c89c7f03f86 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -463,7 +463,6 @@ void l2cap_sock_init(struct sock *sk, struct sock *parent); struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock, int proto, gfp_t prio); -void l2cap_chan_clear_timer(struct l2cap_chan *chan); struct l2cap_chan *l2cap_chan_create(struct sock *sk); void __l2cap_chan_close(struct l2cap_chan *chan, int reason); void l2cap_chan_destroy(struct l2cap_chan *chan); |