Commit 3b211909 authored by Kalle Valo's avatar Kalle Valo Committed by John W. Linville

ath5k: remove get_tx_stats() mac80211 op

get_tx_stats() will be removed from mac80211.

Compile-tested only.

Cc: Jiri Slaby <jirislaby@gmail.com>
Cc: Nick Kossifidis <mickflemm@gmail.com>
Cc: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarKalle Valo <kalle.valo@iki.fi>
Acked-by: default avatarBob Copeland <me@bobcopeland.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d1ace8e5
...@@ -241,8 +241,6 @@ static int ath5k_set_key(struct ieee80211_hw *hw, ...@@ -241,8 +241,6 @@ static int ath5k_set_key(struct ieee80211_hw *hw,
struct ieee80211_key_conf *key); struct ieee80211_key_conf *key);
static int ath5k_get_stats(struct ieee80211_hw *hw, static int ath5k_get_stats(struct ieee80211_hw *hw,
struct ieee80211_low_level_stats *stats); struct ieee80211_low_level_stats *stats);
static int ath5k_get_tx_stats(struct ieee80211_hw *hw,
struct ieee80211_tx_queue_stats *stats);
static u64 ath5k_get_tsf(struct ieee80211_hw *hw); static u64 ath5k_get_tsf(struct ieee80211_hw *hw);
static void ath5k_set_tsf(struct ieee80211_hw *hw, u64 tsf); static void ath5k_set_tsf(struct ieee80211_hw *hw, u64 tsf);
static void ath5k_reset_tsf(struct ieee80211_hw *hw); static void ath5k_reset_tsf(struct ieee80211_hw *hw);
...@@ -269,7 +267,6 @@ static const struct ieee80211_ops ath5k_hw_ops = { ...@@ -269,7 +267,6 @@ static const struct ieee80211_ops ath5k_hw_ops = {
.set_key = ath5k_set_key, .set_key = ath5k_set_key,
.get_stats = ath5k_get_stats, .get_stats = ath5k_get_stats,
.conf_tx = NULL, .conf_tx = NULL,
.get_tx_stats = ath5k_get_tx_stats,
.get_tsf = ath5k_get_tsf, .get_tsf = ath5k_get_tsf,
.set_tsf = ath5k_set_tsf, .set_tsf = ath5k_set_tsf,
.reset_tsf = ath5k_reset_tsf, .reset_tsf = ath5k_reset_tsf,
...@@ -1332,7 +1329,6 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf, ...@@ -1332,7 +1329,6 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf,
spin_lock_bh(&txq->lock); spin_lock_bh(&txq->lock);
list_add_tail(&bf->list, &txq->q); list_add_tail(&bf->list, &txq->q);
sc->tx_stats[txq->qnum].len++;
if (txq->link == NULL) /* is this first packet? */ if (txq->link == NULL) /* is this first packet? */
ath5k_hw_set_txdp(ah, txq->qnum, bf->daddr); ath5k_hw_set_txdp(ah, txq->qnum, bf->daddr);
else /* no, so only link it */ else /* no, so only link it */
...@@ -1581,7 +1577,6 @@ ath5k_txq_drainq(struct ath5k_softc *sc, struct ath5k_txq *txq) ...@@ -1581,7 +1577,6 @@ ath5k_txq_drainq(struct ath5k_softc *sc, struct ath5k_txq *txq)
ath5k_txbuf_free(sc, bf); ath5k_txbuf_free(sc, bf);
spin_lock_bh(&sc->txbuflock); spin_lock_bh(&sc->txbuflock);
sc->tx_stats[txq->qnum].len--;
list_move_tail(&bf->list, &sc->txbuf); list_move_tail(&bf->list, &sc->txbuf);
sc->txbuf_len++; sc->txbuf_len++;
spin_unlock_bh(&sc->txbuflock); spin_unlock_bh(&sc->txbuflock);
...@@ -2011,10 +2006,8 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq) ...@@ -2011,10 +2006,8 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq)
} }
ieee80211_tx_status(sc->hw, skb); ieee80211_tx_status(sc->hw, skb);
sc->tx_stats[txq->qnum].count++;
spin_lock(&sc->txbuflock); spin_lock(&sc->txbuflock);
sc->tx_stats[txq->qnum].len--;
list_move_tail(&bf->list, &sc->txbuf); list_move_tail(&bf->list, &sc->txbuf);
sc->txbuf_len++; sc->txbuf_len++;
spin_unlock(&sc->txbuflock); spin_unlock(&sc->txbuflock);
...@@ -3116,17 +3109,6 @@ ath5k_get_stats(struct ieee80211_hw *hw, ...@@ -3116,17 +3109,6 @@ ath5k_get_stats(struct ieee80211_hw *hw,
return 0; return 0;
} }
static int
ath5k_get_tx_stats(struct ieee80211_hw *hw,
struct ieee80211_tx_queue_stats *stats)
{
struct ath5k_softc *sc = hw->priv;
memcpy(stats, &sc->tx_stats, sizeof(sc->tx_stats));
return 0;
}
static u64 static u64
ath5k_get_tsf(struct ieee80211_hw *hw) ath5k_get_tsf(struct ieee80211_hw *hw)
{ {
......
...@@ -117,7 +117,6 @@ struct ath5k_softc { ...@@ -117,7 +117,6 @@ struct ath5k_softc {
struct pci_dev *pdev; /* for dma mapping */ struct pci_dev *pdev; /* for dma mapping */
void __iomem *iobase; /* address of the device */ void __iomem *iobase; /* address of the device */
struct mutex lock; /* dev-level lock */ struct mutex lock; /* dev-level lock */
struct ieee80211_tx_queue_stats tx_stats[AR5K_NUM_TX_QUEUES];
struct ieee80211_low_level_stats ll_stats; struct ieee80211_low_level_stats ll_stats;
struct ieee80211_hw *hw; /* IEEE 802.11 common */ struct ieee80211_hw *hw; /* IEEE 802.11 common */
struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment