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

Commit 58e3dd15 authored by Thierry Escande's avatar Thierry Escande Committed by Samuel Ortiz
Browse files

NFC: Rename nfc_llcp_disconnect() to nfc_llcp_send_disconnect() 



nfc_llcp_send_disconnect() already exists but is not used.
nfc_llcp_disconnect() naming is not consistent with other PDU
sending functions.
This patch removes nfc_llcp_send_disconnect() and renames
nfc_llcp_disconnect()

Signed-off-by: default avatarThierry Escande <thierry.escande@linux.intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 86eca4e7

net/nfc/llcp.h

+0 −1
Original line number Diff line number Diff line
@@ -246,7 +246,6 @@ struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, char *uri, 
void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp);

void nfc_llcp_free_sdp_tlv_list(struct hlist_head *sdp_head);

void nfc_llcp_recv(void *data, struct sk_buff *skb, int err);

int nfc_llcp_disconnect(struct nfc_llcp_sock *sock);

int nfc_llcp_send_symm(struct nfc_dev *dev);

int nfc_llcp_send_connect(struct nfc_llcp_sock *sock);

int nfc_llcp_send_cc(struct nfc_llcp_sock *sock);

net/nfc/llcp_commands.c

+1 −21
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ static struct sk_buff *llcp_allocate_pdu(struct nfc_llcp_sock *sock, 
	return skb;

}



int nfc_llcp_disconnect(struct nfc_llcp_sock *sock)

int nfc_llcp_send_disconnect(struct nfc_llcp_sock *sock)

{

	struct sk_buff *skb;

	struct nfc_dev *dev;
@@ -630,26 +630,6 @@ int nfc_llcp_send_dm(struct nfc_llcp_local *local, u8 ssap, u8 dsap, u8 reason) 
	return 0;

}



int nfc_llcp_send_disconnect(struct nfc_llcp_sock *sock)

{

	struct sk_buff *skb;

	struct nfc_llcp_local *local;



	pr_debug("Send DISC\n");



	local = sock->local;

	if (local == NULL)

		return -ENODEV;



	skb = llcp_allocate_pdu(sock, LLCP_PDU_DISC, 0);

	if (skb == NULL)

		return -ENOMEM;



	skb_queue_head(&local->tx_queue, skb);



	return 0;

}



int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock,

			  struct msghdr *msg, size_t len)

{

net/nfc/llcp_sock.c

+2 −2
Original line number Diff line number Diff line
@@ -603,7 +603,7 @@ static int llcp_sock_release(struct socket *sock) 


	/* Send a DISC */

	if (sk->sk_state == LLCP_CONNECTED)

		nfc_llcp_disconnect(llcp_sock);

		nfc_llcp_send_disconnect(llcp_sock);



	if (sk->sk_state == LLCP_LISTEN) {

		struct nfc_llcp_sock *lsk, *n;
@@ -614,7 +614,7 @@ static int llcp_sock_release(struct socket *sock) 
			accept_sk = &lsk->sk;

			lock_sock(accept_sk);



			nfc_llcp_disconnect(lsk);

			nfc_llcp_send_disconnect(lsk);

			nfc_llcp_accept_unlink(accept_sk);



			release_sock(accept_sk);