diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-05-03 14:53:49 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-05-03 14:53:49 -0400 |
| commit | 1d7d969dd0b467ba32cf3829e8bf104a5084150d (patch) | |
| tree | f0de3aca8a33bed612ba2c09f61fcabe289dc14d /net/mac80211 | |
| parent | 12ef116bf750c221e214e33c61e7f4c98300b5fd (diff) | |
| parent | f8478df1eab2f11aefc4b6668c5867949ab96bd7 (diff) | |
| download | talos-obmc-linux-1d7d969dd0b467ba32cf3829e8bf104a5084150d.tar.gz talos-obmc-linux-1d7d969dd0b467ba32cf3829e8bf104a5084150d.zip | |
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
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 7dfe833d9716..2b6a0c47ed53 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 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, 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) { |
