diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-09-20 17:32:18 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-09-20 17:32:18 +0000 |
| commit | 38323b6e6162e0f12c0a1652bed5586be0796212 (patch) | |
| tree | d0f368be7eedb04fd202cdd2e72496b9015e333c /package/mac80211/patches | |
| parent | 6a745d7e2a692af9b0776a0a8f32bff4f1e366cc (diff) | |
| download | upstream-38323b6e6162e0f12c0a1652bed5586be0796212.tar.gz upstream-38323b6e6162e0f12c0a1652bed5586be0796212.tar.bz2 upstream-38323b6e6162e0f12c0a1652bed5586be0796212.zip | |
ath9k: fix a warning during a failed aggregation start
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23100 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches')
| -rw-r--r-- | package/mac80211/patches/521-ath9k_aggr_race_fix.patch | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/package/mac80211/patches/521-ath9k_aggr_race_fix.patch b/package/mac80211/patches/521-ath9k_aggr_race_fix.patch index 0da1e6124d..0dbbc13f9b 100644 --- a/package/mac80211/patches/521-ath9k_aggr_race_fix.patch +++ b/package/mac80211/patches/521-ath9k_aggr_race_fix.patch @@ -41,12 +41,15 @@ void ath9k_enable_ps(struct ath_softc *sc); --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c -@@ -1968,7 +1968,7 @@ static int ath9k_ampdu_action(struct iee +@@ -1968,8 +1968,9 @@ static int ath9k_ampdu_action(struct iee break; case IEEE80211_AMPDU_TX_START: ath9k_ps_wakeup(sc); - ath_tx_aggr_start(sc, sta, tid, ssn); +- ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid); + ret = ath_tx_aggr_start(sc, sta, tid, ssn); - ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid); ++ if (!ret) ++ ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid); ath9k_ps_restore(sc); break; + case IEEE80211_AMPDU_TX_STOP: |