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

Commit 554f05bb authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Bluetooth: move l2cap_sock_release() to l2cap_sock.c 



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

include/net/bluetooth/l2cap.h

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



int l2cap_sock_release(struct socket *sock);

int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen);

int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int alen, int flags);

int l2cap_sock_listen(struct socket *sock, int backlog);

net/bluetooth/l2cap_core.c

+0 −17
Original line number Diff line number Diff line
@@ -2159,23 +2159,6 @@ int l2cap_sock_shutdown(struct socket *sock, int how) 
	return err;

}



int l2cap_sock_release(struct socket *sock)

{

	struct sock *sk = sock->sk;

	int err;



	BT_DBG("sock %p, sk %p", sock, sk);



	if (!sk)

		return 0;



	err = l2cap_sock_shutdown(sock, 2);



	sock_orphan(sk);

	l2cap_sock_kill(sk);

	return err;

}



static void l2cap_chan_ready(struct sock *sk)

{

	struct sock *parent = bt_sk(sk)->parent;

net/bluetooth/l2cap_sock.c

+17 −0
Original line number Diff line number Diff line
@@ -62,6 +62,23 @@ static void l2cap_sock_timeout(unsigned long arg) 
	sock_put(sk);

}



static int l2cap_sock_release(struct socket *sock)

{

	struct sock *sk = sock->sk;

	int err;



	BT_DBG("sock %p, sk %p", sock, sk);



	if (!sk)

		return 0;



	err = l2cap_sock_shutdown(sock, 2);



	sock_orphan(sk);

	l2cap_sock_kill(sk);

	return err;

}



static void l2cap_sock_destruct(struct sock *sk)

{

	BT_DBG("sk %p", sk);