mac80211: backport latest version from trunk
[openwrt-10.03/.git] / package / mac80211 / patches / 532-ath9k_remove_pending_frames_workaround.patch
1 --- a/drivers/net/wireless/ath/ath9k/xmit.c
2 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
3 @@ -2223,33 +2223,6 @@ static void ath_tx_complete_poll_work(st
4                                 } else {
5                                         txq->axq_tx_inprogress = true;
6                                 }
7 -                       } else {
8 -                               /* If the queue has pending buffers, then it
9 -                                * should be doing tx work (and have axq_depth).
10 -                                * Shouldn't get to this state I think..but
11 -                                * we do.
12 -                                */
13 -                               if (!(sc->sc_flags & (SC_OP_OFFCHANNEL)) &&
14 -                                   (txq->pending_frames > 0 ||
15 -                                    !list_empty(&txq->axq_acq) ||
16 -                                    txq->stopped)) {
17 -                                       ath_err(ath9k_hw_common(sc->sc_ah),
18 -                                               "txq: %p axq_qnum: %u,"
19 -                                               " mac80211_qnum: %i"
20 -                                               " axq_link: %p"
21 -                                               " pending frames: %i"
22 -                                               " axq_acq empty: %i"
23 -                                               " stopped: %i"
24 -                                               " axq_depth: 0  Attempting to"
25 -                                               " restart tx logic.\n",
26 -                                               txq, txq->axq_qnum,
27 -                                               txq->mac80211_qnum,
28 -                                               txq->axq_link,
29 -                                               txq->pending_frames,
30 -                                               list_empty(&txq->axq_acq),
31 -                                               txq->stopped);
32 -                                       ath_txq_schedule(sc, txq);
33 -                               }
34                         }
35                         spin_unlock_bh(&txq->axq_lock);
36                 }