Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 500698d3 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

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: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent ab07801d

include/net/bluetooth/l2cap.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

net/bluetooth/l2cap_core.c

+2 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static void l2cap_chan_set_timer(struct l2cap_chan *chan, long timeout) 
	       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);
@@ -423,6 +423,7 @@ void __l2cap_chan_close(struct l2cap_chan *chan, int reason) 
	case BT_CONFIG:

		if (chan->chan_type == L2CAP_CHAN_CONN_ORIENTED &&

					conn->hcon->type == ACL_LINK) {

			l2cap_chan_clear_timer(chan);

			l2cap_chan_set_timer(chan, sk->sk_sndtimeo);

			l2cap_send_disconn_req(conn, chan, reason);

		} else

net/bluetooth/l2cap_sock.c

+0 −1
Original line number Diff line number Diff line
@@ -707,7 +707,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)