From 1d59bd98713974e343aad0e70a2625eb047d84da Mon Sep 17 00:00:00 2001 From: Luciano Coelho Date: Mon, 27 Feb 2012 19:26:21 +0200 Subject: [PATCH] wlcore: update channel also when channel type has changed We were not updating wl->channel_type when only the type has changed in wl12xx_config_vif. This was causing problems when restarting the AP role in the same channel as before. Signed-off-by: Luciano Coelho --- drivers/net/wireless/ti/wlcore/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index b2a03a7abf8e..6d9da29ce7ea 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -2353,7 +2353,8 @@ static int wl12xx_config_vif(struct wl1271 *wl, struct wl12xx_vif *wlvif, /* if the channel changes while joined, join again */ if (changed & IEEE80211_CONF_CHANGE_CHANNEL && ((wlvif->band != conf->channel->band) || - (wlvif->channel != channel))) { + (wlvif->channel != channel) || + wlvif->channel_type != conf->channel_type)) { /* send all pending packets */ wl1271_tx_work_locked(wl); wlvif->band = conf->channel->band;