From 0271ba588a314c0f5796aef766fb23ff2ec66681 Mon Sep 17 00:00:00 2001
From: Stanislaw Gruszka <sgruszka@redhat.com>
Date: Thu, 7 Jun 2012 14:47:21 +0200
Subject: [PATCH] --- yaml --- r: 310770 b: refs/heads/master c:
 6aee4ca3d2217d3f76469e5ed576d62695f0912a h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 62f3029b63b8..bf444107810f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58d1eab7ef1d7ff8e448699dfd1a21b7f3303296
+refs/heads/master: 6aee4ca3d2217d3f76469e5ed576d62695f0912a
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index d94627c2929c..91d84cc77bbf 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -3124,7 +3124,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
 	}
 
 	local->oper_channel = cbss->channel;
-	ieee80211_hw_config(local, 0);
+	ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
 
 	if (!have_sta) {
 		u32 rates = 0, basic_rates = 0;