commit 56af2568c27ee697a5a34cf037e3253e7b77e80b
author Samuel Ortiz <sameo@linux.intel.com> Wed May 30 18:06:11 2012 +0200
committer Samuel Ortiz <sameo@linux.intel.com> Mon Jun 04 21:34:33 2012 +0200
tree 6c42d3060b7517d22433e05a19fd5ee3291c5ebb
parent 844579603889ef1ab1fdbf2223579d6842e62bfe

NFC: Send a receiver ready frame only to reply to an I frame

Sending an RR as a reply to another RR is fine but not quite logical.
We should send RRs only as a reply to I frames.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

net/nfc/llcp/llcp.c

diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c
index 0fc60da..3fe68e1 100644
--- a/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp/llcp.c
@@ -810,7 +810,7 @@
 	else if (ptype == LLCP_PDU_RNR)
 		llcp_sock->remote_ready = false;
 
-	if (nfc_llcp_queue_i_frames(llcp_sock) == 0)
+	if (nfc_llcp_queue_i_frames(llcp_sock) == 0 && ptype == LLCP_PDU_I)
 		nfc_llcp_send_rr(llcp_sock);
 
 	release_sock(sk);