diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-20 17:57:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-20 17:57:56 -0700 |
| commit | e46754f8c9333170f11780d8e3a70da1b1a88338 (patch) | |
| tree | 9b7ac1c7cb4c147c69767908c6dcb7633fb03f12 /net | |
| parent | ef9e83c1ab2981769f16e626179dd56895041b38 (diff) | |
| parent | fe6f212ce12341df18ef9b890bea739b4547157b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -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 96d25348aa5..87782a4bb54 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -184,7 +184,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", diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index c8cd169fc10..4aefa6dc309 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -168,6 +168,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) { |