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>
This commit is contained in:
parent
ab07801d28
commit
500698d3fd
|
@ -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,
|
struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock,
|
||||||
int proto, gfp_t prio);
|
int proto, gfp_t prio);
|
||||||
|
|
||||||
void l2cap_chan_clear_timer(struct l2cap_chan *chan);
|
|
||||||
struct l2cap_chan *l2cap_chan_create(struct sock *sk);
|
struct l2cap_chan *l2cap_chan_create(struct sock *sk);
|
||||||
void __l2cap_chan_close(struct l2cap_chan *chan, int reason);
|
void __l2cap_chan_close(struct l2cap_chan *chan, int reason);
|
||||||
void l2cap_chan_destroy(struct l2cap_chan *chan);
|
void l2cap_chan_destroy(struct l2cap_chan *chan);
|
||||||
|
|
|
@ -216,7 +216,7 @@ static void l2cap_chan_set_timer(struct l2cap_chan *chan, long timeout)
|
||||||
sock_hold(chan->sk);
|
sock_hold(chan->sk);
|
||||||
}
|
}
|
||||||
|
|
||||||
void l2cap_chan_clear_timer(struct l2cap_chan *chan)
|
static void l2cap_chan_clear_timer(struct l2cap_chan *chan)
|
||||||
{
|
{
|
||||||
BT_DBG("chan %p state %d", chan, chan->sk->sk_state);
|
BT_DBG("chan %p state %d", chan, chan->sk->sk_state);
|
||||||
|
|
||||||
|
@ -423,6 +423,7 @@ void __l2cap_chan_close(struct l2cap_chan *chan, int reason)
|
||||||
case BT_CONFIG:
|
case BT_CONFIG:
|
||||||
if (chan->chan_type == L2CAP_CHAN_CONN_ORIENTED &&
|
if (chan->chan_type == L2CAP_CHAN_CONN_ORIENTED &&
|
||||||
conn->hcon->type == ACL_LINK) {
|
conn->hcon->type == ACL_LINK) {
|
||||||
|
l2cap_chan_clear_timer(chan);
|
||||||
l2cap_chan_set_timer(chan, sk->sk_sndtimeo);
|
l2cap_chan_set_timer(chan, sk->sk_sndtimeo);
|
||||||
l2cap_send_disconn_req(conn, chan, reason);
|
l2cap_send_disconn_req(conn, chan, reason);
|
||||||
} else
|
} else
|
||||||
|
|
|
@ -707,7 +707,6 @@ static int l2cap_sock_shutdown(struct socket *sock, int how)
|
||||||
err = __l2cap_wait_ack(sk);
|
err = __l2cap_wait_ack(sk);
|
||||||
|
|
||||||
sk->sk_shutdown = SHUTDOWN_MASK;
|
sk->sk_shutdown = SHUTDOWN_MASK;
|
||||||
l2cap_chan_clear_timer(chan);
|
|
||||||
__l2cap_chan_close(chan, 0);
|
__l2cap_chan_close(chan, 0);
|
||||||
|
|
||||||
if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime)
|
if (sock_flag(sk, SOCK_LINGER) && sk->sk_lingertime)
|
||||||
|
|
Loading…
Reference in a new issue