Linux kernel stable tree https://git.rulkc.org/pub/scm/linux/kernel/git/stable/linux.git/atom?h=master 2013-04-26T10:37:28+00:00 2013-04-26T10:37:28+00:00 Samuel Ortiz sameo@linux.intel.com 2013-04-26T09:49:40+00:00 urn:sha1:30cc4587659e1c9b1bfade8b2a757d91e04758ab And stop making it optional. LLCP is a fundamental part of the NFC specifications and making it optional does not make much sense. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> 2013-04-11T14:29:09+00:00 Samuel Ortiz sameo@linux.intel.com 2013-04-03T14:44:44+00:00 urn:sha1:6d2cd978e5e14c47fa4f8ab3a136e38aceb4940d According to the LLCP specs, we must terminate the LLCP link when receiving a DISC with both ssap and dsap set to 0. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> 2013-04-11T14:29:09+00:00 Samuel Ortiz sameo@linux.intel.com 2013-04-03T14:40:52+00:00 urn:sha1:c470e319b48bf1aae6185f0c896e65c21c02bad3 local_cleanup is always called with device set to false as it means the local LLCP is going away. So no need to pass this switch as an argument. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> 2013-04-11T14:29:09+00:00 Samuel Ortiz sameo@linux.intel.com 2013-04-03T14:34:19+00:00 urn:sha1:b436a13debec2b3d2c671d6bebcdb91dabcb0795 When the MAC goes down, connected and connection less sockets should be notified, but raw sockets should be kept alive. They will get notified only when the physical devices goes away. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> 2013-04-11T14:28:59+00:00 Thierry Escande thierry.escande@linux.intel.com 2013-04-02T08:25:15+00:00 urn:sha1:abd18d43302ae0e214d020c842b34e706cc3778e This resets remote parameters in both local and socket llcp structures when the link goes down. That way, nfc_llcp_getsockopt won't return values corresponding to the previous link parameters. Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> 2013-04-11T14:28:58+00:00 Thierry Escande thierry.escande@linux.intel.com 2013-03-29T10:47:43+00:00 urn:sha1:098dafcfb4db0d3c08cffec88c87bbb2f4513f20 This adds support for AGF PDUs. For each PDU contained in the AGF, a new sk_buff is allocated and dispatched to its corresponding handler. Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> 2013-04-10T13:31:39+00:00 John W. Linville linville@tuxdriver.com 2013-04-10T13:31:39+00:00 urn:sha1:6fe5468f452c0c40348ebd4e737758a842286ca8 Conflicts: drivers/net/wireless/rt2x00/rt2x00pci.c 2013-03-20T15:46:40+00:00 Thierry Escande thierry.escande@linux.intel.com 2013-03-20T15:00:16+00:00 urn:sha1:b3155155440190de78fb501953136a6c5b82e327 kfree_skb was called twice when the socket receive queue is full Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> 2013-03-20T10:30:37+00:00 Samuel Ortiz sameo@linux.intel.com 2013-03-20T09:50:50+00:00 urn:sha1:bec964ed3b2549086e1fdfbf7f1ce8c22f89baa4 Calling sock_orphan when e.g. the NFC adapter is removed can lead to kernel crashes when e.g. a connection less client is sleeping on the Rx workqueue, waiting for data to show up. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> 2013-03-18T13:39:21+00:00 John W. Linville linville@tuxdriver.com 2013-03-18T13:39:21+00:00 urn:sha1:49c87cd1eac1f798c5bad7f7eb809e6df36b6c56 Conflicts: net/nfc/llcp/llcp.c