diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-10-06 22:25:52 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-06 22:25:52 +0200 |
| commit | 373426cac0cbb7f762018127803dcd70838e2cdf (patch) | |
| tree | 701322d66576c343051db9c091eb3805d340cdc3 | |
| parent | Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | mac80211: delete AddBA response timer (diff) | |
| download | linux-373426cac0cbb7f762018127803dcd70838e2cdf.tar.xz linux-373426cac0cbb7f762018127803dcd70838e2cdf.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ani.c | 2 | ||||
| -rw-r--r-- | net/mac80211/agg-tx.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c index 0496f965314f..45f477ad7608 100644 --- a/drivers/net/wireless/ath/ath9k/ani.c +++ b/drivers/net/wireless/ath/ath9k/ani.c @@ -544,7 +544,7 @@ static u8 ath9k_hw_chan_2_clockrate_mhz(struct ath_hw *ah) if (conf_is_ht40(conf)) return clockrate * 2; - return clockrate * 2; + return clockrate; } static int32_t ath9k_hw_ani_get_listen_time(struct ath_hw *ah) diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c index c893f236acea..8f23401832b7 100644 --- a/net/mac80211/agg-tx.c +++ b/net/mac80211/agg-tx.c @@ -175,6 +175,8 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, set_bit(HT_AGG_STATE_STOPPING, &tid_tx->state); + del_timer_sync(&tid_tx->addba_resp_timer); + /* * After this packets are no longer handed right through * to the driver but are put onto tid_tx->pending instead, |