]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
NFC: llcp: Do not send pending Tx frames when the remote is not ready
authorSamuel Ortiz <sameo@linux.intel.com>
Tue, 28 May 2013 13:03:17 +0000 (15:03 +0200)
committerSamuel Ortiz <sameo@linux.intel.com>
Fri, 14 Jun 2013 11:45:08 +0000 (13:45 +0200)
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>
net/nfc/llcp_core.c

index 44730f0edfd861c2d196e887083a71482c1bd8a2..47746a088f8fca501a9d9b3ca1c67f280c98baf5 100644 (file)
@@ -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);