aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-scan.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index d817c9c184a5..83e62917e0bf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -644,10 +644,10 @@ u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame,
644 if (WARN_ON(left < ie_len)) 644 if (WARN_ON(left < ie_len))
645 return len; 645 return len;
646 646
647 if (ies) 647 if (ies && ie_len) {
648 memcpy(pos, ies, ie_len); 648 memcpy(pos, ies, ie_len);
649 len += ie_len; 649 len += ie_len;
650 left -= ie_len; 650 }
651 651
652 return (u16)len; 652 return (u16)len;
653} 653}