aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorStanislaw Gruszka <sgruszka@redhat.com>2012-06-07 08:47:21 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-06-08 13:47:08 -0400
commit6aee4ca3d2217d3f76469e5ed576d62695f0912a (patch)
tree60f9e2b3c872dc91fbff1a053edcf83d69a4cfcf /net
parent58d1eab7ef1d7ff8e448699dfd1a21b7f3303296 (diff)
mac80211: add back channel change flag
commit 24398e39c8ee4a9d9123eed322b859ece4d16cac Author: Johannes Berg <johannes.berg@intel.com> Date: Wed Mar 28 10:58:36 2012 +0200 mac80211: set HT channel before association removed IEEE80211_CONF_CHANGE_CHANNEL argument from ieee80211_hw_config, which is required by iwl4965 driver, otherwise that driver does not configure channel properly and is not able to associate. Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/mlme.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index d94627c2929c..91d84cc77bbf 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3124,7 +3124,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
3124 } 3124 }
3125 3125
3126 local->oper_channel = cbss->channel; 3126 local->oper_channel = cbss->channel;
3127 ieee80211_hw_config(local, 0); 3127 ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
3128 3128
3129 if (!have_sta) { 3129 if (!have_sta) {
3130 u32 rates = 0, basic_rates = 0; 3130 u32 rates = 0, basic_rates = 0;