diff options
author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:31 +0200 |
---|---|---|
committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-04-06 11:11:31 +0200 |
commit | 5c807f98e94548dac3fcbd391389c0869f8a9f32 (patch) | |
tree | d8b652c2d428b78f7bdfd890102b5a5ca2628093 /net/mac80211/mlme.c | |
parent | fe07b033c06f6f5e9bda543da22cfa7962325e56 (diff) | |
parent | bd6a3784c37447e7336759ff4910f6cd3ff89f34 (diff) |
Merge topic branch 'wlan' into integration-linux-ux500-3.3
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r-- | net/mac80211/mlme.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 295be92f7c7..f24430b66ee 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -2502,6 +2502,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, wk->probe_auth.algorithm = auth_alg; wk->probe_auth.privacy = req->bss->capability & WLAN_CAPABILITY_PRIVACY; + wk->probe_auth.bss = req->bss; /* if we already have a probe, don't probe again */ if (req->bss->proberesp_ies) |