networking: introduce and use skb_put_data()

[mirror_ubuntu-artful-kernel.git] / drivers / net / wireless / intel / iwlwifi / pcie / tx.c

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
index 386950a2d6162845ccf3aa2ca24c968750d5d2cd..01013d273aa71d5742ba07aeaddc6c6a2283309f 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
@@ -2141,8 +2141,7 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb,
                                                        htons(ETH_P_IPV6),
                                                    data_left);
 
-                       memcpy(skb_put(csum_skb, tcp_hdrlen(skb)),
-                              tcph, tcp_hdrlen(skb));
+                       skb_put_data(csum_skb, tcph, tcp_hdrlen(skb));
                        skb_reset_transport_header(csum_skb);
                        csum_skb->csum_start =
                                (unsigned char *)tcp_hdr(csum_skb) -
@@ -2176,7 +2175,7 @@ static int iwl_fill_data_tbs_amsdu(struct iwl_trans *trans, struct sk_buff *skb,
                        dma_addr_t tb_phys;
 
                        if (trans_pcie->sw_csum_tx)
-                               memcpy(skb_put(csum_skb, size), tso.data, size);
+                               skb_put_data(csum_skb, tso.data, size);
 
                        tb_phys = dma_map_single(trans->dev, tso.data,
                                                 size, DMA_TO_DEVICE);