summaryrefslogtreecommitdiffstats
path: root/net/nfc/llcp_sock.c
diff options
context:
space:
mode:
authorSzymon Janc2013-11-30 16:59:23 +0100
committerSamuel Ortiz2014-01-04 03:32:27 +0100
commit11bfb1c4b94fe24a83ebeae5c3310280f9606e0e (patch)
tree47bf31dd80d66b7a223d3c4c9df3228e32e06409 /net/nfc/llcp_sock.c
parentNFC: llcp: Fix possible memory leak while sending I frames (diff)
downloadkernel-qcow2-linux-11bfb1c4b94fe24a83ebeae5c3310280f9606e0e.tar.gz
kernel-qcow2-linux-11bfb1c4b94fe24a83ebeae5c3310280f9606e0e.tar.xz
kernel-qcow2-linux-11bfb1c4b94fe24a83ebeae5c3310280f9606e0e.zip
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>
Diffstat (limited to 'net/nfc/llcp_sock.c')
-rw-r--r--net/nfc/llcp_sock.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index 69fbc8dadba7..4a53bb58a463 100644
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -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;