Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
This commit is contained in:
commit
373426cac0
|
@ -544,7 +544,7 @@ static u8 ath9k_hw_chan_2_clockrate_mhz(struct ath_hw *ah)
|
||||||
if (conf_is_ht40(conf))
|
if (conf_is_ht40(conf))
|
||||||
return clockrate * 2;
|
return clockrate * 2;
|
||||||
|
|
||||||
return clockrate * 2;
|
return clockrate;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int32_t ath9k_hw_ani_get_listen_time(struct ath_hw *ah)
|
static int32_t ath9k_hw_ani_get_listen_time(struct ath_hw *ah)
|
||||||
|
|
|
@ -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);
|
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
|
* After this packets are no longer handed right through
|
||||||
* to the driver but are put onto tid_tx->pending instead,
|
* to the driver but are put onto tid_tx->pending instead,
|
||||||
|
|
Reference in New Issue