NFC: Factorize the I frame queueing routine

This one will be called from the I frame command sending.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/nfc/llcp/llcp.c b/net/nfc/llcp/llcp.c
index 1d32680807d67f3729bb19724d9c09ba2f4cc599..8510a2fb3da8f0110e65fa8801116373c3ff26fb 100644 (file)
--- a/net/nfc/llcp/llcp.c
+++ b/net/nfc/llcp/llcp.c
@@ -616,6 +616,33 @@ fail:
 
 }
 
+void nfc_llcp_queue_i_frames(struct nfc_llcp_sock *sock)
+{
+       struct nfc_llcp_local *local = sock->local;
+
+       pr_debug("Remote ready %d tx queue len %d remote rw %d",
+               sock->remote_ready, skb_queue_len(&sock->tx_pending_queue),
+               local->remote_rw);
+
+       /* Try to queue some I frames for transmission */
+       while (sock->remote_ready &&
+               skb_queue_len(&sock->tx_pending_queue) < local->remote_rw) {
+               struct sk_buff *pdu, *pending_pdu;
+
+               pdu = skb_dequeue(&sock->tx_queue);
+               if (pdu == NULL)
+                       break;
+
+               /* Update N(S)/N(R) */
+               nfc_llcp_set_nrns(sock, pdu);
+
+               pending_pdu = skb_clone(pdu, GFP_KERNEL);
+
+               skb_queue_tail(&local->tx_queue, pdu);
+               skb_queue_tail(&sock->tx_pending_queue, pending_pdu);
+       }
+}
+
 static void nfc_llcp_recv_hdlc(struct nfc_llcp_local *local,
                                struct sk_buff *skb)
 {
@@ -673,23 +700,7 @@ static void nfc_llcp_recv_hdlc(struct nfc_llcp_local *local,
                        }
        }
 
-       /* Queue some I frames for transmission */
-       while (llcp_sock->remote_ready &&
-               skb_queue_len(&llcp_sock->tx_pending_queue) <= local->remote_rw) {
-               struct sk_buff *pdu, *pending_pdu;
-
-               pdu = skb_dequeue(&llcp_sock->tx_queue);
-               if (pdu == NULL)
-                       break;
-
-               /* Update N(S)/N(R) */
-               nfc_llcp_set_nrns(llcp_sock, pdu);
-
-               pending_pdu = skb_clone(pdu, GFP_KERNEL);
-
-               skb_queue_tail(&local->tx_queue, pdu);
-               skb_queue_tail(&llcp_sock->tx_pending_queue, pending_pdu);
-       }
+       nfc_llcp_queue_i_frames(llcp_sock);
 
        release_sock(sk);
        nfc_llcp_sock_put(llcp_sock);

diff --git a/net/nfc/llcp/llcp.h b/net/nfc/llcp/llcp.h
index 0ad2e3361584a074ab2c0a09b489d1056889f247..0a72ee627641ff79adcbf74c4adab0da510bede4 100644 (file)
--- a/net/nfc/llcp/llcp.h
+++ b/net/nfc/llcp/llcp.h
@@ -165,6 +165,7 @@ u8 nfc_llcp_get_sdp_ssap(struct nfc_llcp_local *local,
                                struct nfc_llcp_sock *sock);
 u8 nfc_llcp_get_local_ssap(struct nfc_llcp_local *local);
 void nfc_llcp_put_ssap(struct nfc_llcp_local *local, u8 ssap);
+void nfc_llcp_queue_i_frames(struct nfc_llcp_sock *sock);
 
 /* Sock API */
 struct sock *nfc_llcp_sock_alloc(struct socket *sock, int type, gfp_t gfp);