Commit 11bfb1c4 authored by Szymon Janc's avatar Szymon Janc Committed by Samuel Ortiz
Browse files

NFC: llcp: Use default MIU if none was specified on connect 



If MIUX is not present in CONNECT or CC use default MIU value (128)
instead of one announced durring link setup.

This was affecting Bluetooth handover with Android 4.3+ NCI stack.

Signed-off-by: default avatarSzymon Janc <szymon.janc@gmail.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 43d53c29

net/nfc/llcp_commands.c

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock, 


	do {

		remote_miu = sock->remote_miu > LLCP_MAX_MIU ?

				local->remote_miu : sock->remote_miu;

				LLCP_DEFAULT_MIU : sock->remote_miu;



		frag_len = min_t(size_t, remote_miu, remaining_len);

net/nfc/llcp_core.c

+0 −1
Original line number Diff line number Diff line
@@ -943,7 +943,6 @@ static void nfc_llcp_recv_connect(struct nfc_llcp_local *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->nfc_protocol = sock->nfc_protocol;

	new_sock->dsap = ssap;

	new_sock->target_idx = local->target_idx;

net/nfc/llcp_sock.c

+0 −1
Original line number Diff line number Diff line
@@ -700,7 +700,6 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr, 


	llcp_sock->dev = dev;

	llcp_sock->local = nfc_llcp_local_get(local);

	llcp_sock->remote_miu = llcp_sock->local->remote_miu;

	llcp_sock->ssap = nfc_llcp_get_local_ssap(local);

	if (llcp_sock->ssap == LLCP_SAP_MAX) {

		ret = -ENOMEM;