commit 11bfb1c4b94fe24a83ebeae5c3310280f9606e0e
author Szymon Janc <szymon.janc@gmail.com> Sat Nov 30 16:59:23 2013 +0100
committer Samuel Ortiz <sameo@linux.intel.com> Sat Jan 04 03:32:27 2014 +0100
tree 47bf31dd80d66b7a223d3c4c9df3228e32e06409
parent 43d53c29dd8548404256c05573ff557c927d214b

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: Szymon Janc <szymon.janc@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

net/nfc/llcp_commands.c

diff --git a/net/nfc/llcp_commands.c b/net/nfc/llcp_commands.c
index 80057a8..bec6ed1 100644
--- a/net/nfc/llcp_commands.c
+++ b/net/nfc/llcp_commands.c
@@ -675,7 +675,7 @@
 
 	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

diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c
index 1349074..6184bd1 100644
--- a/net/nfc/llcp_core.c
+++ b/net/nfc/llcp_core.c
@@ -943,7 +943,6 @@
 	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

diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index 69fbc8d..4a53bb5 100644
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -700,7 +700,6 @@
 
 	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;