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

Conflicts:
	drivers/net/wireless/ath/ar9170/main.c
	drivers/net/wireless/ath/ar9170/phy.c
	drivers/net/wireless/zd1211rw/zd_rf_rf2959.c

1 files changed, 1 insertions, 28 deletions

diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 88fa7fdffd05..3cea3f76e373 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -1980,7 +1980,7 @@ static void ath_tx_rc_status(struct ath_softc *sc, struct ath_buf *bf,
                 if (ieee80211_is_data(hdr->frame_control) &&
                     (ts->ts_flags & (ATH9K_TX_DATA_UNDERRUN |
                                      ATH9K_TX_DELIM_UNDERRUN)) &&
-                    ah->tx_trig_level >= sc->sc_ah->caps.tx_triglevel_max)
+                    ah->tx_trig_level >= sc->sc_ah->config.max_txtrig_level)
                         tx_info->status.rates[tx_rateindex].count =
                                 hw->max_rate_tries;
         }
@@ -2144,33 +2144,6 @@ static void ath_tx_complete_poll_work(struct work_struct *work)
                                 } else {
                                         txq->axq_tx_inprogress = true;
                                 }
-                        } else {
-                                /* If the queue has pending buffers, then it
-                                 * should be doing tx work (and have axq_depth).
-                                 * Shouldn't get to this state I think..but
-                                 * we do.
-                                 */
-                                if (!(sc->sc_flags & (SC_OP_OFFCHANNEL)) &&
-                                    (txq->pending_frames > 0 ||
-                                     !list_empty(&txq->axq_acq) ||
-                                     txq->stopped)) {
-                                        ath_err(ath9k_hw_common(sc->sc_ah),
-                                                "txq: %p axq_qnum: %u,"
-                                                " mac80211_qnum: %i"
-                                                " axq_link: %p"
-                                                " pending frames: %i"
-                                                " axq_acq empty: %i"
-                                                " stopped: %i"
-                                                " axq_depth: 0  Attempting to"
-                                                " restart tx logic.\n",
-                                                txq, txq->axq_qnum,
-                                                txq->mac80211_qnum,
-                                                txq->axq_link,
-                                                txq->pending_frames,
-                                                list_empty(&txq->axq_acq),
-                                                txq->stopped);
-                                        ath_txq_schedule(sc, txq);
-                                }
                         }
                         spin_unlock_bh(&txq->axq_lock);
                 }