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

Commit 05fc1576 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Bluetooth: move l2cap_sock_kill() to l2cap_sock.c 



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

net/bluetooth/l2cap_core.c

+0 −16
Original line number Diff line number Diff line
@@ -753,22 +753,6 @@ static void l2cap_sock_cleanup_listen(struct sock *parent) 
	sock_set_flag(parent, SOCK_ZAPPED);

}



/* Kill socket (only if zapped and orphan)

 * Must be called on unlocked socket.

 */

void l2cap_sock_kill(struct sock *sk)

{

	if (!sock_flag(sk, SOCK_ZAPPED) || sk->sk_socket)

		return;



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



	/* Kill poor orphan */

	bt_sock_unlink(&l2cap_sk_list, sk);

	sock_set_flag(sk, SOCK_DEAD);

	sock_put(sk);

}



void __l2cap_sock_close(struct sock *sk, int reason)

{

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

net/bluetooth/l2cap_sock.c

+16 −0
Original line number Diff line number Diff line
@@ -838,6 +838,22 @@ static int l2cap_sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct ms 
	return bt_sock_recvmsg(iocb, sock, msg, len, flags);

}



/* Kill socket (only if zapped and orphan)

 * Must be called on unlocked socket.

 */

void l2cap_sock_kill(struct sock *sk)

{

	if (!sock_flag(sk, SOCK_ZAPPED) || sk->sk_socket)

		return;



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



	/* Kill poor orphan */

	bt_sock_unlink(&l2cap_sk_list, sk);

	sock_set_flag(sk, SOCK_DEAD);

	sock_put(sk);

}



static int l2cap_sock_shutdown(struct socket *sock, int how)

{

	struct sock *sk = sock->sk;