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

Commit d7175d55 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Bluetooth: move l2cap_sock_getname() to l2cap_sock.c 



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

include/net/bluetooth/l2cap.h

+0 −1
Original line number Diff line number Diff line
@@ -439,7 +439,6 @@ struct sock *l2cap_sock_alloc(struct net *net, struct socket *sock, 
							int proto, gfp_t prio);



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

int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr, int *len, int peer);

int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len);

int l2cap_sock_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len, int flags);

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

net/bluetooth/l2cap_core.c

+0 −23
Original line number Diff line number Diff line
@@ -993,29 +993,6 @@ int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr, int alen, int 
	return err;

}



int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr, int *len, int peer)

{

	struct sockaddr_l2 *la = (struct sockaddr_l2 *) addr;

	struct sock *sk = sock->sk;



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



	addr->sa_family = AF_BLUETOOTH;

	*len = sizeof(struct sockaddr_l2);



	if (peer) {

		la->l2_psm = l2cap_pi(sk)->psm;

		bacpy(&la->l2_bdaddr, &bt_sk(sk)->dst);

		la->l2_cid = cpu_to_le16(l2cap_pi(sk)->dcid);

	} else {

		la->l2_psm = l2cap_pi(sk)->sport;

		bacpy(&la->l2_bdaddr, &bt_sk(sk)->src);

		la->l2_cid = cpu_to_le16(l2cap_pi(sk)->scid);

	}



	return 0;

}



static int __l2cap_wait_ack(struct sock *sk)

{

	DECLARE_WAITQUEUE(wait, current);

net/bluetooth/l2cap_sock.c

+23 −0
Original line number Diff line number Diff line
@@ -253,6 +253,29 @@ static int l2cap_sock_accept(struct socket *sock, struct socket *newsock, int fl 
	return err;

}



static int l2cap_sock_getname(struct socket *sock, struct sockaddr *addr, int *len, int peer)

{

	struct sockaddr_l2 *la = (struct sockaddr_l2 *) addr;

	struct sock *sk = sock->sk;



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



	addr->sa_family = AF_BLUETOOTH;

	*len = sizeof(struct sockaddr_l2);



	if (peer) {

		la->l2_psm = l2cap_pi(sk)->psm;

		bacpy(&la->l2_bdaddr, &bt_sk(sk)->dst);

		la->l2_cid = cpu_to_le16(l2cap_pi(sk)->dcid);

	} else {

		la->l2_psm = l2cap_pi(sk)->sport;

		bacpy(&la->l2_bdaddr, &bt_sk(sk)->src);

		la->l2_cid = cpu_to_le16(l2cap_pi(sk)->scid);

	}



	return 0;

}



static int l2cap_sock_release(struct socket *sock)

{

	struct sock *sk = sock->sk;