NFC fixes for 3.4
Subsystems (2)
cover NFC fixes for 3.4
Hi John,
In case Linus does an rc7 and Dave takes more 3.4 fixes in, here are the 2 pending ones that I have for NFC
I sent the nfc.h export one yesterday, I'm including it here again.
So we have an nfc.h export to the kernel hearders, and a fix for large LLCP frame fragments to be sent in the right order.
Samuel Ortiz (2):
NFC: Export nfc.h to userland
NFC: Queue I frame fragments to the LLCP sockets queue tail
include/linux/Kbuild | 1 + net/nfc/llcp/commands.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)
Signature · 1 line
1.7.9.1
PATCH 1/2 NFC: Export nfc.h to userland
The netlink commands and attributes, along with the socket structure definitions need to be exported.
--- include/linux/Kbuild | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
include/linux/Kbuild +1 -0
@@ -271,6 +271,7 @@ header-y += netfilter_ipv4.h header-y += netfilter_ipv6.h header-y += netlink.h header-y += netrom.h +header-y += nfc.h header-y += nfs.h header-y += nfs2.h header-y += nfs3.h
Signature · 1 line
1.7.9.1
PATCH 2/2 NFC: Queue I frame fragments to the LLCP sockets queue tail
In reply to Samuel OrtizAfter testing our stack with large SNEP messages, we realized the fragments were arriving in reversed order.
--- net/nfc/llcp/commands.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
net/nfc/llcp/commands.c +1 -1
@@ -488,7 +488,7 @@ int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock,memcpy (skb_put (pdu, frag_len), msg_ptr, frag_len); -skb_queue_head (&sock->tx_queue, pdu); +skb_queue_tail (&sock->tx_queue, pdu);lock_sock (sk);
Signature · 1 line
1.7.9.1