diff options
Diffstat (limited to 'net/nfc/nci/data.c')
-rw-r--r-- | net/nfc/nci/data.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/net/nfc/nci/data.c b/net/nfc/nci/data.c index 7880ae924d5e..a0bc326308a5 100644 --- a/net/nfc/nci/data.c +++ b/net/nfc/nci/data.c | |||
@@ -35,8 +35,7 @@ | |||
35 | #include <linux/nfc.h> | 35 | #include <linux/nfc.h> |
36 | 36 | ||
37 | /* Complete data exchange transaction and forward skb to nfc core */ | 37 | /* Complete data exchange transaction and forward skb to nfc core */ |
38 | void nci_data_exchange_complete(struct nci_dev *ndev, | 38 | void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb, |
39 | struct sk_buff *skb, | ||
40 | int err) | 39 | int err) |
41 | { | 40 | { |
42 | data_exchange_cb_t cb = ndev->data_exchange_cb; | 41 | data_exchange_cb_t cb = ndev->data_exchange_cb; |
@@ -67,9 +66,9 @@ void nci_data_exchange_complete(struct nci_dev *ndev, | |||
67 | /* ----------------- NCI TX Data ----------------- */ | 66 | /* ----------------- NCI TX Data ----------------- */ |
68 | 67 | ||
69 | static inline void nci_push_data_hdr(struct nci_dev *ndev, | 68 | static inline void nci_push_data_hdr(struct nci_dev *ndev, |
70 | __u8 conn_id, | 69 | __u8 conn_id, |
71 | struct sk_buff *skb, | 70 | struct sk_buff *skb, |
72 | __u8 pbf) | 71 | __u8 pbf) |
73 | { | 72 | { |
74 | struct nci_data_hdr *hdr; | 73 | struct nci_data_hdr *hdr; |
75 | int plen = skb->len; | 74 | int plen = skb->len; |
@@ -86,8 +85,8 @@ static inline void nci_push_data_hdr(struct nci_dev *ndev, | |||
86 | } | 85 | } |
87 | 86 | ||
88 | static int nci_queue_tx_data_frags(struct nci_dev *ndev, | 87 | static int nci_queue_tx_data_frags(struct nci_dev *ndev, |
89 | __u8 conn_id, | 88 | __u8 conn_id, |
90 | struct sk_buff *skb) { | 89 | struct sk_buff *skb) { |
91 | int total_len = skb->len; | 90 | int total_len = skb->len; |
92 | unsigned char *data = skb->data; | 91 | unsigned char *data = skb->data; |
93 | unsigned long flags; | 92 | unsigned long flags; |
@@ -105,8 +104,8 @@ static int nci_queue_tx_data_frags(struct nci_dev *ndev, | |||
105 | min_t(int, total_len, ndev->max_data_pkt_payload_size); | 104 | min_t(int, total_len, ndev->max_data_pkt_payload_size); |
106 | 105 | ||
107 | skb_frag = nci_skb_alloc(ndev, | 106 | skb_frag = nci_skb_alloc(ndev, |
108 | (NCI_DATA_HDR_SIZE + frag_len), | 107 | (NCI_DATA_HDR_SIZE + frag_len), |
109 | GFP_KERNEL); | 108 | GFP_KERNEL); |
110 | if (skb_frag == NULL) { | 109 | if (skb_frag == NULL) { |
111 | rc = -ENOMEM; | 110 | rc = -ENOMEM; |
112 | goto free_exit; | 111 | goto free_exit; |
@@ -118,7 +117,8 @@ static int nci_queue_tx_data_frags(struct nci_dev *ndev, | |||
118 | 117 | ||
119 | /* second, set the header */ | 118 | /* second, set the header */ |
120 | nci_push_data_hdr(ndev, conn_id, skb_frag, | 119 | nci_push_data_hdr(ndev, conn_id, skb_frag, |
121 | ((total_len == frag_len) ? (NCI_PBF_LAST) : (NCI_PBF_CONT))); | 120 | ((total_len == frag_len) ? |
121 | (NCI_PBF_LAST) : (NCI_PBF_CONT))); | ||
122 | 122 | ||
123 | __skb_queue_tail(&frags_q, skb_frag); | 123 | __skb_queue_tail(&frags_q, skb_frag); |
124 | 124 | ||
@@ -186,8 +186,8 @@ exit: | |||
186 | /* ----------------- NCI RX Data ----------------- */ | 186 | /* ----------------- NCI RX Data ----------------- */ |
187 | 187 | ||
188 | static void nci_add_rx_data_frag(struct nci_dev *ndev, | 188 | static void nci_add_rx_data_frag(struct nci_dev *ndev, |
189 | struct sk_buff *skb, | 189 | struct sk_buff *skb, |
190 | __u8 pbf) | 190 | __u8 pbf) |
191 | { | 191 | { |
192 | int reassembly_len; | 192 | int reassembly_len; |
193 | int err = 0; | 193 | int err = 0; |
@@ -211,8 +211,8 @@ static void nci_add_rx_data_frag(struct nci_dev *ndev, | |||
211 | 211 | ||
212 | /* second, combine the two fragments */ | 212 | /* second, combine the two fragments */ |
213 | memcpy(skb_push(skb, reassembly_len), | 213 | memcpy(skb_push(skb, reassembly_len), |
214 | ndev->rx_data_reassembly->data, | 214 | ndev->rx_data_reassembly->data, |
215 | reassembly_len); | 215 | reassembly_len); |
216 | 216 | ||
217 | /* third, free old reassembly */ | 217 | /* third, free old reassembly */ |
218 | kfree_skb(ndev->rx_data_reassembly); | 218 | kfree_skb(ndev->rx_data_reassembly); |