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

Commit 6ddc0485 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Bluetooth: move L2CAP sock timers function to l2cap_sock.c 



Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent fd83ccdb

net/bluetooth/l2cap_core.c

+0 −13
Original line number Diff line number Diff line
@@ -77,19 +77,6 @@ static struct sk_buff *l2cap_build_cmd(struct l2cap_conn *conn, 


static int l2cap_ertm_data_rcv(struct sock *sk, struct sk_buff *skb);



/* ---- L2CAP timers ---- */

void l2cap_sock_set_timer(struct sock *sk, long timeout)

{

	BT_DBG("sk %p state %d timeout %ld", sk, sk->sk_state, timeout);

	sk_reset_timer(sk, &sk->sk_timer, jiffies + timeout);

}



void l2cap_sock_clear_timer(struct sock *sk)

{

	BT_DBG("sock %p state %d", sk, sk->sk_state);

	sk_stop_timer(sk, &sk->sk_timer);

}



/* ---- L2CAP channels ---- */

static struct sock *__l2cap_get_chan_by_dcid(struct l2cap_chan_list *l, u16 cid)

{

net/bluetooth/l2cap_sock.c

+13 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <net/bluetooth/hci_core.h>

#include <net/bluetooth/l2cap.h>



/* ---- L2CAP timers ---- */

static void l2cap_sock_timeout(unsigned long arg)

{

	struct sock *sk = (struct sock *) arg;
@@ -63,6 +64,18 @@ static void l2cap_sock_timeout(unsigned long arg) 
	sock_put(sk);

}



void l2cap_sock_set_timer(struct sock *sk, long timeout)

{

	BT_DBG("sk %p state %d timeout %ld", sk, sk->sk_state, timeout);

	sk_reset_timer(sk, &sk->sk_timer, jiffies + timeout);

}



void l2cap_sock_clear_timer(struct sock *sk)

{

	BT_DBG("sock %p state %d", sk, sk->sk_state);

	sk_stop_timer(sk, &sk->sk_timer);

}



static struct sock *__l2cap_get_sock_by_addr(__le16 psm, bdaddr_t *src)

{

	struct sock *sk;