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

Commit 06d44f80 authored by Samuel Ortiz's avatar Samuel Ortiz
Browse files

NFC: llcp: Use socket specific link parameters before the local ones 



If the socket link options are set, use them before the local one.

Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 26fd76ca

net/nfc/llcp/commands.c

+16 −8
Original line number Original line Diff line number Diff line
@@ -319,9 +319,9 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock) 
	struct sk_buff *skb;

	struct sk_buff *skb;

	u8 *service_name_tlv = NULL, service_name_tlv_length;

	u8 *service_name_tlv = NULL, service_name_tlv_length;

	u8 *miux_tlv = NULL, miux_tlv_length;

	u8 *miux_tlv = NULL, miux_tlv_length;

	u8 *rw_tlv = NULL, rw_tlv_length;

	u8 *rw_tlv = NULL, rw_tlv_length, rw;

	int err;

	int err;

	u16 size = 0;

	u16 size = 0, miux;





	pr_debug("Sending CONNECT\n");

	pr_debug("Sending CONNECT\n");
@@ -337,11 +337,15 @@ int nfc_llcp_send_connect(struct nfc_llcp_sock *sock) 
		size += service_name_tlv_length;

		size += service_name_tlv_length;

	}

	}





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

	/* If the socket parameters are not set, use the local ones */

	miux = sock->miux > LLCP_MAX_MIUX ? local->miux : sock->miux;

	rw = sock->rw > LLCP_MAX_RW ? local->rw : sock->rw;



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

				      &miux_tlv_length);

				      &miux_tlv_length);

	size += miux_tlv_length;

	size += miux_tlv_length;





	rw_tlv = nfc_llcp_build_tlv(LLCP_TLV_RW, &local->rw, 0, &rw_tlv_length);

	rw_tlv = nfc_llcp_build_tlv(LLCP_TLV_RW, &rw, 0, &rw_tlv_length);

	size += rw_tlv_length;

	size += rw_tlv_length;





	pr_debug("SKB size %d SN length %zu\n", size, sock->service_name_len);

	pr_debug("SKB size %d SN length %zu\n", size, sock->service_name_len);
@@ -378,9 +382,9 @@ int nfc_llcp_send_cc(struct nfc_llcp_sock *sock) 
	struct nfc_llcp_local *local;

	struct nfc_llcp_local *local;

	struct sk_buff *skb;

	struct sk_buff *skb;

	u8 *miux_tlv = NULL, miux_tlv_length;

	u8 *miux_tlv = NULL, miux_tlv_length;

	u8 *rw_tlv = NULL, rw_tlv_length;

	u8 *rw_tlv = NULL, rw_tlv_length, rw;

	int err;

	int err;

	u16 size = 0;

	u16 size = 0, miux;





	pr_debug("Sending CC\n");

	pr_debug("Sending CC\n");
@@ -388,11 +392,15 @@ int nfc_llcp_send_cc(struct nfc_llcp_sock *sock) 
	if (local == NULL)

	if (local == NULL)

		return -ENODEV;

		return -ENODEV;





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

	/* If the socket parameters are not set, use the local ones */

	miux = sock->miux > LLCP_MAX_MIUX ? local->miux : sock->miux;

	rw = sock->rw > LLCP_MAX_RW ? local->rw : sock->rw;



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

				      &miux_tlv_length);

				      &miux_tlv_length);

	size += miux_tlv_length;

	size += miux_tlv_length;





	rw_tlv = nfc_llcp_build_tlv(LLCP_TLV_RW, &local->rw, 0, &rw_tlv_length);

	rw_tlv = nfc_llcp_build_tlv(LLCP_TLV_RW, &rw, 0, &rw_tlv_length);

	size += rw_tlv_length;

	size += rw_tlv_length;





	skb = llcp_allocate_pdu(sock, LLCP_PDU_CC, size);

	skb = llcp_allocate_pdu(sock, LLCP_PDU_CC, size);

net/nfc/llcp/llcp.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -865,6 +865,8 @@ static void nfc_llcp_recv_connect(struct nfc_llcp_local *local, 
	new_sock = nfc_llcp_sock(new_sk);

	new_sock = nfc_llcp_sock(new_sk);

	new_sock->dev = local->dev;

	new_sock->dev = local->dev;

	new_sock->local = nfc_llcp_local_get(local);

	new_sock->local = nfc_llcp_local_get(local);

	new_sock->rw = sock->rw;

	new_sock->miux = sock->miux;

	new_sock->remote_miu = local->remote_miu;

	new_sock->remote_miu = local->remote_miu;

	new_sock->nfc_protocol = sock->nfc_protocol;

	new_sock->nfc_protocol = sock->nfc_protocol;

	new_sock->dsap = ssap;

	new_sock->dsap = ssap;

net/nfc/llcp/sock.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -290,6 +290,9 @@ static int nfc_llcp_setsockopt(struct socket *sock, int level, int optname, 




	release_sock(sk);

	release_sock(sk);





	pr_debug("%p rw %d miux %d\n", llcp_sock,

		 llcp_sock->rw, llcp_sock->miux);



	return err;

	return err;

}

}
@@ -915,6 +918,8 @@ struct sock *nfc_llcp_sock_alloc(struct socket *sock, int type, gfp_t gfp) 




	llcp_sock->ssap = 0;

	llcp_sock->ssap = 0;

	llcp_sock->dsap = LLCP_SAP_SDP;

	llcp_sock->dsap = LLCP_SAP_SDP;

	llcp_sock->rw = LLCP_MAX_RW + 1;

	llcp_sock->miux = LLCP_MAX_MIUX + 1;

	llcp_sock->remote_rw = LLCP_DEFAULT_RW;

	llcp_sock->remote_rw = LLCP_DEFAULT_RW;

	llcp_sock->remote_miu = LLCP_DEFAULT_MIU;

	llcp_sock->remote_miu = LLCP_DEFAULT_MIU;

	llcp_sock->send_n = llcp_sock->send_ack_n = 0;

	llcp_sock->send_n = llcp_sock->send_ack_n = 0;