diff options
-rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 18 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath5k/base.h | 1 |
2 files changed, 0 insertions, 19 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 535a6afb94e3..97d642575550 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c | |||
@@ -241,8 +241,6 @@ static int ath5k_set_key(struct ieee80211_hw *hw, | |||
241 | struct ieee80211_key_conf *key); | 241 | struct ieee80211_key_conf *key); |
242 | static int ath5k_get_stats(struct ieee80211_hw *hw, | 242 | static int ath5k_get_stats(struct ieee80211_hw *hw, |
243 | struct ieee80211_low_level_stats *stats); | 243 | struct ieee80211_low_level_stats *stats); |
244 | static int ath5k_get_tx_stats(struct ieee80211_hw *hw, | ||
245 | struct ieee80211_tx_queue_stats *stats); | ||
246 | static u64 ath5k_get_tsf(struct ieee80211_hw *hw); | 244 | static u64 ath5k_get_tsf(struct ieee80211_hw *hw); |
247 | static void ath5k_set_tsf(struct ieee80211_hw *hw, u64 tsf); | 245 | static void ath5k_set_tsf(struct ieee80211_hw *hw, u64 tsf); |
248 | static void ath5k_reset_tsf(struct ieee80211_hw *hw); | 246 | static void ath5k_reset_tsf(struct ieee80211_hw *hw); |
@@ -269,7 +267,6 @@ static const struct ieee80211_ops ath5k_hw_ops = { | |||
269 | .set_key = ath5k_set_key, | 267 | .set_key = ath5k_set_key, |
270 | .get_stats = ath5k_get_stats, | 268 | .get_stats = ath5k_get_stats, |
271 | .conf_tx = NULL, | 269 | .conf_tx = NULL, |
272 | .get_tx_stats = ath5k_get_tx_stats, | ||
273 | .get_tsf = ath5k_get_tsf, | 270 | .get_tsf = ath5k_get_tsf, |
274 | .set_tsf = ath5k_set_tsf, | 271 | .set_tsf = ath5k_set_tsf, |
275 | .reset_tsf = ath5k_reset_tsf, | 272 | .reset_tsf = ath5k_reset_tsf, |
@@ -1332,7 +1329,6 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf, | |||
1332 | 1329 | ||
1333 | spin_lock_bh(&txq->lock); | 1330 | spin_lock_bh(&txq->lock); |
1334 | list_add_tail(&bf->list, &txq->q); | 1331 | list_add_tail(&bf->list, &txq->q); |
1335 | sc->tx_stats[txq->qnum].len++; | ||
1336 | if (txq->link == NULL) /* is this first packet? */ | 1332 | if (txq->link == NULL) /* is this first packet? */ |
1337 | ath5k_hw_set_txdp(ah, txq->qnum, bf->daddr); | 1333 | ath5k_hw_set_txdp(ah, txq->qnum, bf->daddr); |
1338 | else /* no, so only link it */ | 1334 | else /* no, so only link it */ |
@@ -1581,7 +1577,6 @@ ath5k_txq_drainq(struct ath5k_softc *sc, struct ath5k_txq *txq) | |||
1581 | ath5k_txbuf_free(sc, bf); | 1577 | ath5k_txbuf_free(sc, bf); |
1582 | 1578 | ||
1583 | spin_lock_bh(&sc->txbuflock); | 1579 | spin_lock_bh(&sc->txbuflock); |
1584 | sc->tx_stats[txq->qnum].len--; | ||
1585 | list_move_tail(&bf->list, &sc->txbuf); | 1580 | list_move_tail(&bf->list, &sc->txbuf); |
1586 | sc->txbuf_len++; | 1581 | sc->txbuf_len++; |
1587 | spin_unlock_bh(&sc->txbuflock); | 1582 | spin_unlock_bh(&sc->txbuflock); |
@@ -2011,10 +2006,8 @@ ath5k_tx_processq(struct ath5k_softc *sc, struct ath5k_txq *txq) | |||
2011 | } | 2006 | } |
2012 | 2007 | ||
2013 | ieee80211_tx_status(sc->hw, skb); | 2008 | ieee80211_tx_status(sc->hw, skb); |
2014 | sc->tx_stats[txq->qnum].count++; | ||
2015 | 2009 | ||
2016 | spin_lock(&sc->txbuflock); | 2010 | spin_lock(&sc->txbuflock); |
2017 | sc->tx_stats[txq->qnum].len--; | ||
2018 | list_move_tail(&bf->list, &sc->txbuf); | 2011 | list_move_tail(&bf->list, &sc->txbuf); |
2019 | sc->txbuf_len++; | 2012 | sc->txbuf_len++; |
2020 | spin_unlock(&sc->txbuflock); | 2013 | spin_unlock(&sc->txbuflock); |
@@ -3116,17 +3109,6 @@ ath5k_get_stats(struct ieee80211_hw *hw, | |||
3116 | return 0; | 3109 | return 0; |
3117 | } | 3110 | } |
3118 | 3111 | ||
3119 | static int | ||
3120 | ath5k_get_tx_stats(struct ieee80211_hw *hw, | ||
3121 | struct ieee80211_tx_queue_stats *stats) | ||
3122 | { | ||
3123 | struct ath5k_softc *sc = hw->priv; | ||
3124 | |||
3125 | memcpy(stats, &sc->tx_stats, sizeof(sc->tx_stats)); | ||
3126 | |||
3127 | return 0; | ||
3128 | } | ||
3129 | |||
3130 | static u64 | 3112 | static u64 |
3131 | ath5k_get_tsf(struct ieee80211_hw *hw) | 3113 | ath5k_get_tsf(struct ieee80211_hw *hw) |
3132 | { | 3114 | { |
diff --git a/drivers/net/wireless/ath/ath5k/base.h b/drivers/net/wireless/ath/ath5k/base.h index b72338c9bde7..9c2fbf230ce7 100644 --- a/drivers/net/wireless/ath/ath5k/base.h +++ b/drivers/net/wireless/ath/ath5k/base.h | |||
@@ -117,7 +117,6 @@ struct ath5k_softc { | |||
117 | struct pci_dev *pdev; /* for dma mapping */ | 117 | struct pci_dev *pdev; /* for dma mapping */ |
118 | void __iomem *iobase; /* address of the device */ | 118 | void __iomem *iobase; /* address of the device */ |
119 | struct mutex lock; /* dev-level lock */ | 119 | struct mutex lock; /* dev-level lock */ |
120 | struct ieee80211_tx_queue_stats tx_stats[AR5K_NUM_TX_QUEUES]; | ||
121 | struct ieee80211_low_level_stats ll_stats; | 120 | struct ieee80211_low_level_stats ll_stats; |
122 | struct ieee80211_hw *hw; /* IEEE 802.11 common */ | 121 | struct ieee80211_hw *hw; /* IEEE 802.11 common */ |
123 | struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; | 122 | struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; |