aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2012-10-16 09:01:40 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2012-10-26 12:26:50 -0400
commit94f418a206648c9be6fd84d6681d6956b8f8b106 (patch)
tree2fba318547f6b1ad3d3b1324c8eb1e854acc0ca6 /net
parent31ca61a8dffa5c7171d00cfa40a2845e190863c0 (diff)
NFC: UI frame sending routine implementation
UI frames still need to follow the MIU rule, and they need to use the client passed dsap as the listening socket dsap is stuck on SDP. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/nfc/llcp/commands.c46
-rw-r--r--net/nfc/llcp/llcp.h2
2 files changed, 48 insertions, 0 deletions
diff --git a/net/nfc/llcp/commands.c b/net/nfc/llcp/commands.c
index 6db280ddc4c8..79415353cc28 100644
--- a/net/nfc/llcp/commands.c
+++ b/net/nfc/llcp/commands.c
@@ -579,6 +579,52 @@ int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock,
579 return len; 579 return len;
580} 580}
581 581
582int nfc_llcp_send_ui_frame(struct nfc_llcp_sock *sock, u8 ssap, u8 dsap,
583 struct msghdr *msg, size_t len)
584{
585 struct sk_buff *pdu;
586 struct nfc_llcp_local *local;
587 size_t frag_len = 0, remaining_len;
588 u8 *msg_ptr;
589 int err;
590
591 pr_debug("Send UI frame len %zd\n", len);
592
593 local = sock->local;
594 if (local == NULL)
595 return -ENODEV;
596
597 remaining_len = len;
598 msg_ptr = (u8 *) msg->msg_iov;
599
600 while (remaining_len > 0) {
601
602 frag_len = min_t(size_t, sock->miu, remaining_len);
603
604 pr_debug("Fragment %zd bytes remaining %zd",
605 frag_len, remaining_len);
606
607 pdu = nfc_alloc_send_skb(sock->dev, &sock->sk, MSG_DONTWAIT,
608 frag_len + LLCP_HEADER_SIZE, &err);
609 if (pdu == NULL) {
610 pr_err("Could not allocate PDU\n");
611 continue;
612 }
613
614 pdu = llcp_add_header(pdu, dsap, ssap, LLCP_PDU_UI);
615
616 memcpy(skb_put(pdu, frag_len), msg_ptr, frag_len);
617
618 /* No need to check for the peer RW for UI frames */
619 skb_queue_tail(&local->tx_queue, pdu);
620
621 remaining_len -= frag_len;
622 msg_ptr += frag_len;
623 }
624
625 return len;
626}
627
582int nfc_llcp_send_rr(struct nfc_llcp_sock *sock) 628int nfc_llcp_send_rr(struct nfc_llcp_sock *sock)
583{ 629{
584 struct sk_buff *skb; 630 struct sk_buff *skb;
diff --git a/net/nfc/llcp/llcp.h b/net/nfc/llcp/llcp.h
index e06d03571644..276da3a6a589 100644
--- a/net/nfc/llcp/llcp.h
+++ b/net/nfc/llcp/llcp.h
@@ -221,6 +221,8 @@ int nfc_llcp_send_dm(struct nfc_llcp_local *local, u8 ssap, u8 dsap, u8 reason);
221int nfc_llcp_send_disconnect(struct nfc_llcp_sock *sock); 221int nfc_llcp_send_disconnect(struct nfc_llcp_sock *sock);
222int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock, 222int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock,
223 struct msghdr *msg, size_t len); 223 struct msghdr *msg, size_t len);
224int nfc_llcp_send_ui_frame(struct nfc_llcp_sock *sock, u8 ssap, u8 dsap,
225 struct msghdr *msg, size_t len);
224int nfc_llcp_send_rr(struct nfc_llcp_sock *sock); 226int nfc_llcp_send_rr(struct nfc_llcp_sock *sock);
225 227
226/* Socket API */ 228/* Socket API */