Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 199452
b: refs/heads/master
c: 7c9fd60
h: refs/heads/master
v: v3
  • Loading branch information
Vasanthakumar Thiagarajan authored and John W. Linville committed May 28, 2010
1 parent c307e02 commit b6ae0de
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9be8ab2ea81f84c1726d79613c342141f5d19a3b
refs/heads/master: 7c9fd60f9764373414c0a64f500a78635b0a0a7b
4 changes: 3 additions & 1 deletion trunk/drivers/net/wireless/ath/ath9k/xmit.c
Original file line number Diff line number Diff line change
Expand Up @@ -1728,6 +1728,8 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf,
} else
bf->bf_isnullfunc = false;

bf->bf_tx_aborted = false;

return 0;
}

Expand Down Expand Up @@ -1989,7 +1991,7 @@ static int ath_tx_num_badfrms(struct ath_softc *sc, struct ath_buf *bf,
int nbad = 0;
int isaggr = 0;

if (bf->bf_tx_aborted)
if (bf->bf_lastbf->bf_tx_aborted)
return 0;

isaggr = bf_isaggr(bf);
Expand Down

0 comments on commit b6ae0de

Please sign in to comment.