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

ar9170: remove get_tx_stats() mac80211 op

get_tx_stats() will be removed from mac80211.

Because ar9170 uses ieee80211_tx_queue_stats internally, create a new
identical struct ar9170_tx_queue_stats which the driver can use.

Compile-tested only.
Signed-off-by: default avatarKalle Valo <kalle.valo@iki.fi>
Tested-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8ccbc3b8
...@@ -144,6 +144,12 @@ struct ar9170_sta_tid { ...@@ -144,6 +144,12 @@ struct ar9170_sta_tid {
bool active; bool active;
}; };
struct ar9170_tx_queue_stats {
unsigned int len;
unsigned int limit;
unsigned int count;
};
#define AR9170_QUEUE_TIMEOUT 64 #define AR9170_QUEUE_TIMEOUT 64
#define AR9170_TX_TIMEOUT 8 #define AR9170_TX_TIMEOUT 8
#define AR9170_BA_TIMEOUT 4 #define AR9170_BA_TIMEOUT 4
...@@ -211,7 +217,7 @@ struct ar9170 { ...@@ -211,7 +217,7 @@ struct ar9170 {
/* qos queue settings */ /* qos queue settings */
spinlock_t tx_stats_lock; spinlock_t tx_stats_lock;
struct ieee80211_tx_queue_stats tx_stats[5]; struct ar9170_tx_queue_stats tx_stats[5];
struct ieee80211_tx_queue_params edcf[5]; struct ieee80211_tx_queue_params edcf[5];
spinlock_t cmdlock; spinlock_t cmdlock;
......
...@@ -2396,18 +2396,6 @@ static int ar9170_get_stats(struct ieee80211_hw *hw, ...@@ -2396,18 +2396,6 @@ static int ar9170_get_stats(struct ieee80211_hw *hw,
return 0; return 0;
} }
static int ar9170_get_tx_stats(struct ieee80211_hw *hw,
struct ieee80211_tx_queue_stats *tx_stats)
{
struct ar9170 *ar = hw->priv;
spin_lock_bh(&ar->tx_stats_lock);
memcpy(tx_stats, ar->tx_stats, sizeof(tx_stats[0]) * hw->queues);
spin_unlock_bh(&ar->tx_stats_lock);
return 0;
}
static int ar9170_conf_tx(struct ieee80211_hw *hw, u16 queue, static int ar9170_conf_tx(struct ieee80211_hw *hw, u16 queue,
const struct ieee80211_tx_queue_params *param) const struct ieee80211_tx_queue_params *param)
{ {
...@@ -2509,7 +2497,6 @@ static const struct ieee80211_ops ar9170_ops = { ...@@ -2509,7 +2497,6 @@ static const struct ieee80211_ops ar9170_ops = {
.set_key = ar9170_set_key, .set_key = ar9170_set_key,
.sta_notify = ar9170_sta_notify, .sta_notify = ar9170_sta_notify,
.get_stats = ar9170_get_stats, .get_stats = ar9170_get_stats,
.get_tx_stats = ar9170_get_tx_stats,
.ampdu_action = ar9170_ampdu_action, .ampdu_action = ar9170_ampdu_action,
}; };
......
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