From: Eliad Peller Date: Tue, 20 Nov 2012 11:20:04 +0000 (+0200) Subject: wlcore: get channel from bss_conf instead of hw->conf X-Git-Tag: next-20130218~67^2~111^2~50^2^2~34^2~40 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cd1810ddcffbf779afb42c0c675aa93f5a86adda;p=karo-tx-linux.git wlcore: get channel from bss_conf instead of hw->conf We care only about the operational channel, not about the temporal hw channel (which won't have any real meaning in multi-channel env anyway) Signed-off-by: Eliad Peller Reviewed-by: Arik Nemtsov Signed-off-by: Luciano Coelho --- diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index 829d818503ff..03765cf2a666 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -3977,7 +3977,7 @@ static void wl1271_bss_info_changed_sta(struct wl1271 *wl, goto sta_not_found; /* save the supp_rates of the ap */ - sta_rate_set = sta->supp_rates[wl->hw->conf.channel->band]; + sta_rate_set = sta->supp_rates[wlvif->band]; if (sta->ht_cap.ht_supported) sta_rate_set |= (sta->ht_cap.mcs.rx_mask[0] << HW_HT_RATES_OFFSET) |