summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2010-04-19 10:46:31 -0700
committerJohn W. Linville <linville@tuxdriver.com>2010-04-19 16:34:11 -0400
commitfe6f212ce12341df18ef9b890bea739b4547157b (patch)
treea8ac4d32c86d590b28e39866b1533d4a1b4ac1ba /net
parentb4bb5c3fd9333024044362df67e23e96158489ed (diff)
downloadop-kernel-dev-fe6f212ce12341df18ef9b890bea739b4547157b.zip
op-kernel-dev-fe6f212ce12341df18ef9b890bea739b4547157b.tar.gz
mac80211: pass HT changes to driver when off channel
Since "mac80211: make off-channel work generic" drivers have not been notified of configuration changes after association or authentication. This caused more dependence on current state to ensure driver will be notified when configuration changes occur. One such problem arises if off-channel is in progress when HT information changes. Since HT is only enabled on the "oper_channel" the driver will never be notified of this change. Usually the driver is notified soon after of a BSS information change (BSS_CHANGED_HT) ... but since the driver did not get a notification that this is a HT channel the new BSS information does not make sense. Fix this by also changing the off-channel information when HT is enabled and thus cause driver to be notified correctly. This fixes a problem in 4965 when associated with 5GHz 40MHz channel. Without this patch the system can associate but is unable to transfer any data, not even ping. See http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2158 Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-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 be5f723..8a96503 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -167,6 +167,8 @@ static u32 ieee80211_enable_ht(struct ieee80211_sub_if_data *sdata,
ht_changed = conf_is_ht(&local->hw.conf) != enable_ht ||
channel_type != local->hw.conf.channel_type;
+ if (local->tmp_channel)
+ local->tmp_channel_type = channel_type;
local->oper_channel_type = channel_type;
if (ht_changed) {
OpenPOWER on IntegriCloud