summaryrefslogtreecommitdiff
path: root/net/nfc/nci/data.c
diff options
context:
space:
mode:
authorIlan Elias <ilane@ti.com>2011-11-09 14:09:14 +0400
committerJohn W. Linville <linville@tuxdriver.com>2011-11-11 21:32:50 +0400
commite8c0dacd9836dc2dcb28d236c9cc3cfaa9965a20 (patch)
treeafc78589cb1a21a25d6ef0e1ad5532451bc47838 /net/nfc/nci/data.c
parente999882a052a2959571989b2db2b51893d23c0bb (diff)
downloadlinux-e8c0dacd9836dc2dcb28d236c9cc3cfaa9965a20.tar.xz
NFC: Update names and structs to NCI spec 1.0 d18
Addition, deletion and modification of NCI constants. Changes in NCI commands, responses and notifications structures. Signed-off-by: Ilan Elias <ilane@ti.com> Acked-by: Lauro Ramos Venancio <lauro.venancio@openbossa.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/nfc/nci/data.c')
-rw-r--r--net/nfc/nci/data.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/nfc/nci/data.c b/net/nfc/nci/data.c
index e5ed90fc1a9c..511fb96e21bc 100644
--- a/net/nfc/nci/data.c
+++ b/net/nfc/nci/data.c
@@ -95,7 +95,8 @@ static int nci_queue_tx_data_frags(struct nci_dev *ndev,
__skb_queue_head_init(&frags_q);
while (total_len) {
- frag_len = min_t(int, total_len, ndev->max_pkt_payload_size);
+ frag_len =
+ min_t(int, total_len, ndev->max_data_pkt_payload_size);
skb_frag = nci_skb_alloc(ndev,
(NCI_DATA_HDR_SIZE + frag_len),
@@ -151,7 +152,7 @@ int nci_send_data(struct nci_dev *ndev, __u8 conn_id, struct sk_buff *skb)
nfc_dbg("entry, conn_id 0x%x, plen %d", conn_id, skb->len);
/* check if the packet need to be fragmented */
- if (skb->len <= ndev->max_pkt_payload_size) {
+ if (skb->len <= ndev->max_data_pkt_payload_size) {
/* no need to fragment packet */
nci_push_data_hdr(ndev, conn_id, skb, NCI_PBF_LAST);