Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 224599
b: refs/heads/master
c: 9a6b827
h: refs/heads/master
i:
  224597: ecf4143
  224595: 5fe98a8
  224591: b3e8bb2
v: v3
  • Loading branch information
Felix Fietkau authored and John W. Linville committed Nov 17, 2010
1 parent 7add2ae commit a1c96bd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: c5d0855acfa4d6801c4c45bc02ddddd959262050
refs/heads/master: 9a6b82706317333a1fab5dcafa2c33b91253a7a2
6 changes: 3 additions & 3 deletions trunk/drivers/net/wireless/ath/ath9k/xmit.c
Original file line number Diff line number Diff line change
Expand Up @@ -1656,9 +1656,6 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
bf->bf_buf_addr,
txctl->txq->axq_qnum);

if (bf->bf_state.bfs_paprd)
ar9003_hw_set_paprd_txdesc(ah, ds, bf->bf_state.bfs_paprd);

spin_lock_bh(&txctl->txq->axq_lock);

if (bf_isht(bf) && (sc->sc_flags & SC_OP_TXAGGR) &&
Expand All @@ -1684,6 +1681,9 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
bf->bf_state.bfs_ftype = txctl->frame_type;
bf->bf_state.bfs_paprd = txctl->paprd;

if (bf->bf_state.bfs_paprd)
ar9003_hw_set_paprd_txdesc(ah, ds, bf->bf_state.bfs_paprd);

if (txctl->paprd)
bf->bf_state.bfs_paprd_timestamp = jiffies;

Expand Down

0 comments on commit a1c96bd

Please sign in to comment.