diff options
author | Reinette Chatre <reinette.chatre@intel.com> | 2010-04-30 22:13:00 (GMT) |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-04-30 22:13:00 (GMT) |
commit | ad41ee3a45c7de33cfa0057f4a12362ba1f1af32 (patch) | |
tree | 84ad26649f4fce8a3816351ab1d511cf6c6f0bf1 /net/mac80211 | |
parent | 49b5c7f473f1bbcb30275dcaee2c06dfb8ec2279 (diff) | |
parent | 96ff56419504ac6a610ff1af42330e0423242e16 (diff) | |
download | linux-ad41ee3a45c7de33cfa0057f4a12362ba1f1af32.tar.xz |
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')
-rw-r--r-- | net/mac80211/agg-tx.c | 1 | ||||
-rw-r--r-- | net/mac80211/mlme.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index 7dfe833..2b6a0c4 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -183,7 +183,6 @@ static void sta_addba_resp_timer_expired(unsigned long data) HT_AGG_STATE_REQ_STOP_BA_MSK)) != HT_ADDBA_REQUESTED_MSK) { spin_unlock_bh(&sta->lock); - *state = HT_AGG_STATE_IDLE; #ifdef CONFIG_MAC80211_HT_DEBUG printk(KERN_DEBUG "timer expired on tid %d but we are not " "(or no longer) expecting addBA response there\n", diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 2d1a2be..17cb8ae 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, 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) { |