linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Samuel Ortiz <sameo@linux.intel.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: Lauro Ramos Venancio <lauro.venancio@openbossa.org>,
	Aloisio Almeida Jr <aloisio.almeida@openbossa.org>,
	Ilan Elias <ilane@ti.com>,
	linux-wireless@vger.kernel.org,
	Samuel Ortiz <sameo@linux.intel.com>
Subject: [PATCH 12/22] NFC: Fragment LLCP I frames
Date: Mon,  5 Mar 2012 01:03:44 +0100	[thread overview]
Message-ID: <1330905834-6994-13-git-send-email-sameo@linux.intel.com> (raw)
In-Reply-To: <1330905834-6994-1-git-send-email-sameo@linux.intel.com>

Based on the receiver MIU, we have to fragment the frame to be
transmitted.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---
 net/nfc/llcp/commands.c |   57 +++++++++++++++++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/net/nfc/llcp/commands.c b/net/nfc/llcp/commands.c
index a02292b..bfe35b8 100644
--- a/net/nfc/llcp/commands.c
+++ b/net/nfc/llcp/commands.c
@@ -444,29 +444,58 @@ int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock,
 				struct msghdr *msg, size_t len)
 {
 	struct sk_buff *pdu;
-	struct sock *sk;
+	struct sock *sk = &sock->sk;
+	struct nfc_llcp_local *local;
+	size_t frag_len = 0, remaining_len;
+	u8 *msg_data, *msg_ptr;
 
-	pr_debug("Send I frame\n");
+	pr_debug("Send I frame len %zd\n", len);
 
-	pdu = llcp_allocate_pdu(sock, LLCP_PDU_I, len + LLCP_SEQUENCE_SIZE);
-	if (pdu == NULL)
-		return -ENOMEM;
+	local = sock->local;
+	if (local == NULL)
+		return -ENODEV;
 
-	skb_put(pdu, LLCP_SEQUENCE_SIZE);
+	msg_data = kzalloc(len, GFP_KERNEL);
+	if (msg_data == NULL)
+		return -ENOMEM;
 
-	if (memcpy_fromiovec(skb_put(pdu, len), msg->msg_iov, len)) {
-		kfree_skb(pdu);
-		return -EFAULT;
+	if (memcpy_fromiovec(msg_data, msg->msg_iov, len)) {
+			kfree(msg_data);
+			return -EFAULT;
 	}
 
-	skb_queue_head(&sock->tx_queue, pdu);
+	remaining_len = len;
+	msg_ptr = msg_data;
+
+	while (remaining_len > 0) {
+
+		frag_len = min_t(u16, local->remote_miu, remaining_len);
 
-	sk = &sock->sk;
-	lock_sock(sk);
+		pr_debug("Fragment %zd bytes remaining %zd",
+			 frag_len, remaining_len);
 
-	nfc_llcp_queue_i_frames(sock);
+		pdu = llcp_allocate_pdu(sock, LLCP_PDU_I,
+					frag_len + LLCP_SEQUENCE_SIZE);
+		if (pdu == NULL)
+			return -ENOMEM;
+
+		skb_put(pdu, LLCP_SEQUENCE_SIZE);
+
+		memcpy(skb_put(pdu, frag_len), msg_ptr, frag_len);
+
+		skb_queue_head(&sock->tx_queue, pdu);
+
+		lock_sock(sk);
+
+		nfc_llcp_queue_i_frames(sock);
+
+		release_sock(sk);
+
+		remaining_len -= frag_len;
+		msg_ptr += len;
+	}
 
-	release_sock(sk);
+	kfree(msg_data);
 
 	return 0;
 }
-- 
1.7.7.3


  parent reply	other threads:[~2012-03-04 23:57 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-05  0:03 [PATCH 00/22] NFC changes for 3.4 Samuel Ortiz
2012-03-05  0:03 ` [PATCH 01/22] NFC: Export NFCID1 from pn533 Samuel Ortiz
2012-03-05  0:03 ` [PATCH 02/22] NFC: Add device powered netlink attribute Samuel Ortiz
2012-03-05  0:03 ` [PATCH 03/22] NFC: Factorize the I frame queueing routine Samuel Ortiz
2012-03-05  0:03 ` [PATCH 04/22] NFC: Handle Receiver Not Ready LLCP frame Samuel Ortiz
2012-03-05  0:03 ` [PATCH 05/22] NFC: LLCP socket sendmsg implemetation Samuel Ortiz
2012-03-05  0:03 ` [PATCH 06/22] NFC: Fix bitops usage in LLCP Samuel Ortiz
2012-03-05  0:03 ` [PATCH 07/22] NFC: Clear pn533 target structure Samuel Ortiz
2012-03-05  0:03 ` [PATCH 08/22] NFC: Clear LLCP SDPs whan MAC goes down Samuel Ortiz
2012-03-05  0:03 ` [PATCH 09/22] NFC: Set the right LLCP N(R) value for I frames Samuel Ortiz
2012-03-05  0:03 ` [PATCH 10/22] NFC: Send LLCP RR frames to acknowledge received " Samuel Ortiz
2012-03-05  0:03 ` [PATCH 11/22] NFC: Set MIU and RW values from CONNECT and CC LLCP frames Samuel Ortiz
2012-03-05  0:03 ` Samuel Ortiz [this message]
2012-03-05  0:03 ` [PATCH 13/22] NFC: Export sensf from pn533 Samuel Ortiz
2012-03-05  0:03 ` [PATCH 14/22] NFC: Export Jewel/Topaz ID " Samuel Ortiz
2012-03-05  0:03 ` [PATCH 15/22] NFC: Export NFCID when detecting a p2p target with pn533 Samuel Ortiz
2012-03-05  0:03 ` [PATCH 16/22] NFC: Unlink LLCP child sockets from llcp_sock_release Samuel Ortiz
2012-03-05  0:03 ` [PATCH 17/22] NFC: SN is not an invalid GT value Samuel Ortiz
2012-03-05  0:03 ` [PATCH 18/22] NFC: Remove the rf mode parameter from the DEP link up routine Samuel Ortiz
2012-03-05  0:03 ` [PATCH 19/22] NFC: Fix LLCP sockets releasing path Samuel Ortiz
2012-03-05  0:03 ` [PATCH 20/22] NFC: LLCP code identation fixes Samuel Ortiz
2012-03-05  0:03 ` [PATCH 21/22] NFC: Core " Samuel Ortiz
2012-03-05  0:03 ` [PATCH 22/22] NFC: NCI " Samuel Ortiz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1330905834-6994-13-git-send-email-sameo@linux.intel.com \
    --to=sameo@linux.intel.com \
    --cc=aloisio.almeida@openbossa.org \
    --cc=ilane@ti.com \
    --cc=lauro.venancio@openbossa.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).