diff --git a/[refs] b/[refs]
index 0d51f173bc26..aea70b3e49e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fbdf4a2dfbc320bb8422c88c0f59b624043add1
+refs/heads/master: 1ea57b1f12c045db5fca5d1299963ca1c70983ea
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index ca97b80b2651..2f92ae2f9706 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -390,6 +390,9 @@ static void ieee80211_chswitch_work(struct work_struct *work)
 		/* call "hw_config" only if doing sw channel switch */
 		ieee80211_hw_config(sdata->local,
 			IEEE80211_CONF_CHANGE_CHANNEL);
+	} else {
+		/* update the device channel directly */
+		sdata->local->hw.conf.channel = sdata->local->oper_channel;
 	}
 
 	/* XXX: shouldn't really modify cfg80211-owned data! */