From 78e1c59edd94a2fe64362cccdbb717e27a5eb99e Mon Sep 17 00:00:00 2001 From: Hante Meuleman Date: Tue, 11 Sep 2012 21:16:47 +0200 Subject: [PATCH] --- yaml --- r: 323063 b: refs/heads/master c: ed205b361956c96e0d8c09a8c9135a6a79cd9541 h: refs/heads/master i: 323061: 90b0c8d2c35b86d41079b9af1b19ecfb64c3f90c 323059: 8b874a620fe4749415eeff2ddcc3fd66a7164125 323055: 64d706302ca9a3ae2b5052bf281d9398f5b634a0 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6b322f18a896..e4f1284b852e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 022e1d0680c7b4366017393417b8758be5abcee8 +refs/heads/master: ed205b361956c96e0d8c09a8c9135a6a79cd9541 diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c index c36e92312443..50b5553b6964 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c @@ -500,8 +500,10 @@ static void wl_iscan_prep(struct brcmf_scan_params_le *params_le, params_le->active_time = cpu_to_le32(-1); params_le->passive_time = cpu_to_le32(-1); params_le->home_time = cpu_to_le32(-1); - if (ssid && ssid->SSID_len) - memcpy(¶ms_le->ssid_le, ssid, sizeof(struct brcmf_ssid)); + if (ssid && ssid->SSID_len) { + params_le->ssid_le.SSID_len = cpu_to_le32(ssid->SSID_len); + memcpy(¶ms_le->ssid_le.SSID, ssid->SSID, ssid->SSID_len); + } } static s32