aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2010-04-30 18:13:00 -0400
committerReinette Chatre <reinette.chatre@intel.com>2010-04-30 18:13:00 -0400
commitad41ee3a45c7de33cfa0057f4a12362ba1f1af32 (patch)
tree84ad26649f4fce8a3816351ab1d511cf6c6f0bf1 /net/mac80211/mlme.c
parent49b5c7f473f1bbcb30275dcaee2c06dfb8ec2279 (diff)
parent96ff56419504ac6a610ff1af42330e0423242e16 (diff)
Merge branch 'wireless-2.6' into wireless-next-2.6
Patch "iwlwifi: work around passive scan issue" was merged into wireless-2.6, but touched a lot of code since modified (and moved) in wireless-next-2.6. This caused some conflicts. Conflicts: drivers/net/wireless/iwlwifi/iwl-scan.c Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 2d1a2bef366d..17cb8ae912bc 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -174,6 +174,8 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata,
174 ht_changed = conf_is_ht(&local->hw.conf) != enable_ht || 174 ht_changed = conf_is_ht(&local->hw.conf) != enable_ht ||
175 channel_type != local->hw.conf.channel_type; 175 channel_type != local->hw.conf.channel_type;
176 176
177 if (local->tmp_channel)
178 local->tmp_channel_type = channel_type;
177 local->oper_channel_type = channel_type; 179 local->oper_channel_type = channel_type;
178 180
179 if (ht_changed) { 181 if (ht_changed) {