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

Commit 427a2eb1 authored by Samuel Ortiz's avatar Samuel Ortiz Committed by John W. Linville
Browse files

NFC: LLCP code identation fixes 



Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 40c75f81

net/nfc/llcp/commands.c

+21 −18
Original line number Diff line number Diff line
@@ -188,7 +188,8 @@ static struct sk_buff *llcp_add_header(struct sk_buff *pdu, 
	return pdu;

}



static struct sk_buff *llcp_add_tlv(struct sk_buff *pdu, u8 *tlv, u8 tlv_length)

static struct sk_buff *llcp_add_tlv(struct sk_buff *pdu, u8 *tlv,

				    u8 tlv_length)

{

	/* XXX Add an skb length check */
@@ -307,7 +308,8 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock) 
	}



	miux = cpu_to_be16(LLCP_MAX_MIUX);

	miux_tlv = nfc_llcp_build_tlv(LLCP_TLV_MIUX, (u8 *)&miux, 0, &miux_tlv_length);

	miux_tlv = nfc_llcp_build_tlv(LLCP_TLV_MIUX, (u8 *)&miux, 0,

				      &miux_tlv_length);

	size += miux_tlv_length;



	rw = LLCP_MAX_RW;
@@ -360,7 +362,8 @@ int nfc_llcp_send_cc(struct nfc_llcp_sock *sock) 
		return -ENODEV;



	miux = cpu_to_be16(LLCP_MAX_MIUX);

	miux_tlv = nfc_llcp_build_tlv(LLCP_TLV_MIUX, (u8 *)&miux, 0, &miux_tlv_length);

	miux_tlv = nfc_llcp_build_tlv(LLCP_TLV_MIUX, (u8 *)&miux, 0,

				      &miux_tlv_length);

	size += miux_tlv_length;



	rw = LLCP_MAX_RW;

net/nfc/llcp/llcp.c

+47 −46
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ static void nfc_llcp_socket_release(struct nfc_llcp_local *local) 
	struct sock *sk, *parent_sk;

	int i;





	mutex_lock(&local->socket_lock);



	for (i = 0; i < LLCP_MAX_SAP; i++) {
@@ -367,8 +366,7 @@ int nfc_llcp_set_remote_gb(struct nfc_dev *dev, u8 *gb, u8 gb_len) 
	memcpy(local->remote_gb, gb, gb_len);

	local->remote_gb_len = gb_len;



	if (local->remote_gb == NULL ||

			local->remote_gb_len == 0)

	if (local->remote_gb == NULL || local->remote_gb_len == 0)

		return -ENODEV;



	if (memcmp(local->remote_gb, llcp_magic, 3)) {
@@ -377,7 +375,8 @@ int nfc_llcp_set_remote_gb(struct nfc_dev *dev, u8 *gb, u8 gb_len) 
	}



	return nfc_llcp_parse_tlv(local,

			&local->remote_gb[3], local->remote_gb_len - 3);

				  &local->remote_gb[3],

				  local->remote_gb_len - 3);

}



static void nfc_llcp_tx_work(struct work_struct *work)
@@ -588,8 +587,7 @@ enqueue: 
		goto fail;

	}



	new_sk = nfc_llcp_sock_alloc(NULL, parent->sk_type,

				     GFP_ATOMIC);

	new_sk = nfc_llcp_sock_alloc(NULL, parent->sk_type, GFP_ATOMIC);

	if (new_sk == NULL) {

		reason = LLCP_DM_REJ;

		release_sock(&sock->sk);
@@ -757,7 +755,6 @@ static void nfc_llcp_recv_disc(struct nfc_llcp_local *local, 
		nfc_llcp_sock_put(llcp_sock);

	}





	if (sk->sk_state == LLCP_CONNECTED) {

		nfc_put_device(local->dev);

		sk->sk_state = LLCP_CLOSED;
@@ -770,13 +767,11 @@ static void nfc_llcp_recv_disc(struct nfc_llcp_local *local, 
	nfc_llcp_sock_put(llcp_sock);

}



static void nfc_llcp_recv_cc(struct nfc_llcp_local *local,

				struct sk_buff *skb)

static void nfc_llcp_recv_cc(struct nfc_llcp_local *local, struct sk_buff *skb)

{

	struct nfc_llcp_sock *llcp_sock;

	u8 dsap, ssap;





	dsap = nfc_llcp_dsap(skb);

	ssap = nfc_llcp_ssap(skb);
@@ -861,7 +856,7 @@ void nfc_llcp_recv(void *data, struct sk_buff *skb, int err) 


	pr_debug("Received an LLCP PDU\n");

	if (err < 0) {

		pr_err("err %d", err);

		pr_err("err %d\n", err);

		return;

	}
@@ -933,8 +928,10 @@ int nfc_llcp_register_device(struct nfc_dev *ndev) 
	skb_queue_head_init(&local->tx_queue);

	INIT_WORK(&local->tx_work, nfc_llcp_tx_work);

	snprintf(name, sizeof(name), "%s_llcp_tx_wq", dev_name(dev));

	local->tx_wq = alloc_workqueue(name,

			WQ_NON_REENTRANT | WQ_UNBOUND | WQ_MEM_RECLAIM, 1);

	local->tx_wq =

		alloc_workqueue(name,

				WQ_NON_REENTRANT | WQ_UNBOUND | WQ_MEM_RECLAIM,

				1);

	if (local->tx_wq == NULL) {

		err = -ENOMEM;

		goto err_local;
@@ -943,8 +940,10 @@ int nfc_llcp_register_device(struct nfc_dev *ndev) 
	local->rx_pending = NULL;

	INIT_WORK(&local->rx_work, nfc_llcp_rx_work);

	snprintf(name, sizeof(name), "%s_llcp_rx_wq", dev_name(dev));

	local->rx_wq = alloc_workqueue(name,

			WQ_NON_REENTRANT | WQ_UNBOUND | WQ_MEM_RECLAIM, 1);

	local->rx_wq =

		alloc_workqueue(name,

				WQ_NON_REENTRANT | WQ_UNBOUND | WQ_MEM_RECLAIM,

				1);

	if (local->rx_wq == NULL) {

		err = -ENOMEM;

		goto err_tx_wq;
@@ -952,8 +951,10 @@ int nfc_llcp_register_device(struct nfc_dev *ndev) 


	INIT_WORK(&local->timeout_work, nfc_llcp_timeout_work);

	snprintf(name, sizeof(name), "%s_llcp_timeout_wq", dev_name(dev));

	local->timeout_wq = alloc_workqueue(name,

			WQ_NON_REENTRANT | WQ_UNBOUND | WQ_MEM_RECLAIM, 1);

	local->timeout_wq =

		alloc_workqueue(name,

				WQ_NON_REENTRANT | WQ_UNBOUND | WQ_MEM_RECLAIM,

				1);

	if (local->timeout_wq == NULL) {

		err = -ENOMEM;

		goto err_rx_wq;

net/nfc/llcp/sock.c

+29 −26
Original line number Diff line number Diff line
@@ -78,9 +78,11 @@ static int llcp_sock_bind(struct socket *sock, struct sockaddr *addr, int alen) 
	llcp_sock->local = local;

	llcp_sock->nfc_protocol = llcp_addr.nfc_protocol;

	llcp_sock->service_name_len = min_t(unsigned int,

			llcp_addr.service_name_len, NFC_LLCP_MAX_SERVICE_NAME);

					    llcp_addr.service_name_len,

					    NFC_LLCP_MAX_SERVICE_NAME);

	llcp_sock->service_name = kmemdup(llcp_addr.service_name,

				llcp_sock->service_name_len, GFP_KERNEL);

					  llcp_sock->service_name_len,

					  GFP_KERNEL);



	llcp_sock->ssap = nfc_llcp_get_sdp_ssap(local, llcp_sock);

	if (llcp_sock->ssap == LLCP_MAX_SAP)
@@ -364,8 +366,7 @@ static int llcp_sock_release(struct socket *sock) 
	/* Freeing the SAP */

	if ((sk->sk_state == LLCP_CONNECTED

	     && llcp_sock->ssap > LLCP_LOCAL_SAP_OFFSET) ||

	    sk->sk_state == LLCP_BOUND ||

	    sk->sk_state == LLCP_LISTEN)

	    sk->sk_state == LLCP_BOUND || sk->sk_state == LLCP_LISTEN)

		nfc_llcp_put_ssap(llcp_sock->local, llcp_sock->ssap);



	release_sock(sk);
@@ -449,9 +450,11 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr, 
		llcp_sock->dsap = LLCP_SAP_SDP;

	llcp_sock->nfc_protocol = addr->nfc_protocol;

	llcp_sock->service_name_len = min_t(unsigned int,

			addr->service_name_len, NFC_LLCP_MAX_SERVICE_NAME);

					    addr->service_name_len,

					    NFC_LLCP_MAX_SERVICE_NAME);

	llcp_sock->service_name = kmemdup(addr->service_name,

				 llcp_sock->service_name_len, GFP_KERNEL);

					  llcp_sock->service_name_len,

					  GFP_KERNEL);



	local->sockets[llcp_sock->ssap] = llcp_sock;

net/nfc/llcp/llcp.h

+3 −3

File changed.

Contains only whitespace changes.