Skip to content
Snippets Groups Projects
Commit 373426ca authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

parents 46bf6958 44271488
No related branches found
Tags v3.16-rc1
Hide whitespace changes
Inline Side-by-side
drivers/net/wireless/ath/ath9k/ani.c
+ 1
− 1
View file @ 373426ca
...@@ -544,7 +544,7 @@ static u8 ath9k_hw_chan_2_clockrate_mhz(struct ath_hw *ah) ...@@ -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)
......
net/mac80211/agg-tx.c
+ 2
− 0
View file @ 373426ca
...@@ -175,6 +175,8 @@ int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, ...@@ -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,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment