Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem

1 files changed, 2 insertions, 2 deletions

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index ec83f413a7ed..88a565f130a5 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3406,12 +3406,12 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
         i = 0;
         if (info->attrs[NL80211_ATTR_SCAN_SSIDS]) {
                 nla_for_each_nested(attr, info->attrs[NL80211_ATTR_SCAN_SSIDS], tmp) {
+                        request->ssids[i].ssid_len = nla_len(attr);
                         if (request->ssids[i].ssid_len > IEEE80211_MAX_SSID_LEN) {
                                 err = -EINVAL;
                                 goto out_free;
                         }
                         memcpy(request->ssids[i].ssid, nla_data(attr), nla_len(attr));
-                        request->ssids[i].ssid_len = nla_len(attr);
                         i++;
                 }
         }
@@ -3572,6 +3572,7 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
         if (info->attrs[NL80211_ATTR_SCAN_SSIDS]) {
                 nla_for_each_nested(attr, info->attrs[NL80211_ATTR_SCAN_SSIDS],
                                     tmp) {
+                        request->ssids[i].ssid_len = nla_len(attr);
                         if (request->ssids[i].ssid_len >
                             IEEE80211_MAX_SSID_LEN) {
                                 err = -EINVAL;
@@ -3579,7 +3580,6 @@ static int nl80211_start_sched_scan(struct sk_buff *skb,
                         }
                         memcpy(request->ssids[i].ssid, nla_data(attr),
                                nla_len(attr));
-                        request->ssids[i].ssid_len = nla_len(attr);
                         i++;
                 }
         }