Merge tag 'iwlwifi-next-for-kalle-2017-06-28' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / drivers / net / wireless / intel / iwlwifi / mvm / d3.c

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
index 0028325fa22dd9c9c6581fb10bf1957b164b4576..ca2d11f4984e70ebac6d54222a340e2c82606fa9 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@ -1431,7 +1431,7 @@ static void iwl_mvm_report_wakeup_reasons(struct iwl_mvm *mvm,
                        if (!pkt)
                                goto report;
 
-                       memcpy(skb_put(pkt, hdrlen), pktdata, hdrlen);
+                       skb_put_data(pkt, pktdata, hdrlen);
                        pktdata += hdrlen;
                        pktsize -= hdrlen;
 
@@ -1463,7 +1463,7 @@ static void iwl_mvm_report_wakeup_reasons(struct iwl_mvm *mvm,
                        pktsize -= ivlen + icvlen;
                        pktdata += ivlen;
 
-                       memcpy(skb_put(pkt, pktsize), pktdata, pktsize);
+                       skb_put_data(pkt, pktdata, pktsize);
 
                        if (ieee80211_data_to_8023(pkt, vif->addr, vif->type))
                                goto report;