From: Samuel Ortiz <sameo@linux.intel.com>
Date: Tue, 28 May 2013 13:03:17 +0000 (+0200)
Subject: NFC: llcp: Do not send pending Tx frames when the remote is not ready
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2635a4bdfa8d513c531fa7d7a0ccafc1d6a9ff85;p=linux-beck.git

NFC: llcp: Do not send pending Tx frames when the remote is not ready

When we receive a RNR, the remote is busy processing the last received
frame. We set a local flag for that, and we should send a SYMM when it
is set instead of sending any pending frame.

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

diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c
index 44730f0edfd8..47746a088f8f 100644
--- a/net/nfc/llcp_core.c
+++ b/net/nfc/llcp_core.c
@@ -721,6 +721,9 @@ static void nfc_llcp_tx_work(struct work_struct *work)
 		if (llcp_sock == NULL && nfc_llcp_ptype(skb) == LLCP_PDU_I) {
 			kfree_skb(skb);
 			nfc_llcp_send_symm(local->dev);
+		} else if (llcp_sock && !llcp_sock->remote_ready) {
+			skb_queue_head(&local->tx_queue, skb);
+			nfc_llcp_send_symm(local->dev);
 		} else {
 			struct sk_buff *copy_skb = NULL;
 			u8 ptype = nfc_llcp_ptype(skb);