From 2c40c8a4dbe0b21861d69e21fa3bc47f52390e00 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Fri, 16 Apr 2010 15:46:41 +0200 Subject: [PATCH] --- yaml --- r: 194467 b: refs/heads/master c: eb2ec0fb3c2fe85d42b2d5131e526daa0e298b9e h: refs/heads/master i: 194465: a93b192429a2d60c0a656454df759ca8f571d255 194463: 99fa6189377cff272573c968b97cf9adbda38a76 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-scan.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8c03b5d2c587..7d10dcc4bb9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a02a2956809d88b42b9a1f8003d60a343353b5ea +refs/heads/master: eb2ec0fb3c2fe85d42b2d5131e526daa0e298b9e diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c index d817c9c184a5..83e62917e0bf 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c @@ -644,10 +644,10 @@ u16 iwl_fill_probe_req(struct iwl_priv *priv, struct ieee80211_mgmt *frame, if (WARN_ON(left < ie_len)) return len; - if (ies) + if (ies && ie_len) { memcpy(pos, ies, ie_len); - len += ie_len; - left -= ie_len; + len += ie_len; + } return (u16)len; }