diff options
| author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-05-04 19:35:27 -0300 |
|---|---|---|
| committer | Jaikumar Ganesh <jaikumar@google.com> | 2011-07-11 11:59:13 -0700 |
| commit | 1eb5ad7859c58ad6ba073860f57989048f2e2dfe (patch) | |
| tree | ec35ed2d4499fd49fca75177aed0e8c4f00d3b9d /net/bluetooth/l2cap_sock.c | |
| parent | 13003e04ed891cdfa52ccc7023867c896e1ca611 (diff) | |
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 'net/bluetooth/l2cap_sock.c')
| -rw-r--r-- | net/bluetooth/l2cap_sock.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index f07e63ad213..702a8127b24 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c @@ -708,7 +708,6 @@ static int l2cap_sock_shutdown(struct socket *sock, int how) err = __l2cap_wait_ack(sk); sk->sk_shutdown = SHUTDOWN_MASK; - l2cap_chan_clear_timer(chan); __l2cap_chan_close(chan, 0); if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime) |