summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2012-05-30 18:06:11 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-06-04 21:34:33 +0200
commit56af2568c27ee697a5a34cf037e3253e7b77e80b (patch)
tree6c42d3060b7517d22433e05a19fd5ee3291c5ebb /net
parent844579603889ef1ab1fdbf2223579d6842e62bfe (diff)
downloadblackbird-op-linux-56af2568c27ee697a5a34cf037e3253e7b77e80b.tar.gz
blackbird-op-linux-56af2568c27ee697a5a34cf037e3253e7b77e80b.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/nfc/llcp/llcp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c
index 0fc60da6a0a1..3fe68e1d2e88 100644
--- a/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp/llcp.c
@@ -810,7 +810,7 @@ static void nfc_llcp_recv_hdlc(struct nfc_llcp_local *local,
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);
OpenPOWER on IntegriCloud