diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2013-08-16 17:08:40 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2013-08-16 17:08:40 -0700 |
| commit | 3443eff89ed4e2c1dde0472c06924689e43f5c24 (patch) | |
| tree | ef440ec089a65c737435593a48ec3cc84e131e26 | |
| parent | f8613facea90e561c2861059b8b78cd2dfb1d3ea (diff) | |
| parent | 713e77bb10d3112d12b37a3a76d966493209a457 (diff) | |
| download | android_external_wpa_supplicant_8-3443eff89ed4e2c1dde0472c06924689e43f5c24.tar.gz android_external_wpa_supplicant_8-3443eff89ed4e2c1dde0472c06924689e43f5c24.tar.bz2 android_external_wpa_supplicant_8-3443eff89ed4e2c1dde0472c06924689e43f5c24.zip | |
Merge "nl80211: Update the assoc_freq during connect."
| -rw-r--r-- | src/drivers/driver_nl80211.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 73e74cad..ef9643b9 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -1089,7 +1089,8 @@ static unsigned int nl80211_get_assoc_freq(struct wpa_driver_nl80211_data *drv) wpa_printf(MSG_DEBUG, "nl80211: Operating frequency for the " "associated BSS from scan results: %u MHz", arg.assoc_freq); - return arg.assoc_freq ? arg.assoc_freq : drv->assoc_freq; + return (drv->assoc_freq = (arg.assoc_freq ? + arg.assoc_freq : drv->assoc_freq )); } wpa_printf(MSG_DEBUG, "nl80211: Scan result fetch failed: ret=%d " "(%s)", ret, strerror(-ret)); @@ -7242,7 +7243,9 @@ static int wpa_driver_nl80211_try_connect( if (params->freq) { wpa_printf(MSG_DEBUG, " * freq=%d", params->freq); NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, params->freq); - } + drv->assoc_freq = params->freq; + } else + drv->assoc_freq = 0; if (params->bg_scan_period >= 0) { wpa_printf(MSG_DEBUG, " * bg scan period=%d", params->bg_scan_period); |