dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Kalle Valo <kalle.valo@iki.fi>
Tested-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Kalle Valo 2010-02-07 10:21:00 +02:00 committed by John W. Linville
parent 8ccbc3b8b0
commit d1ace8e57a
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/ath/ar9170/ar9170.h
View File

@ -144,6 +144,12 @@ struct ar9170_sta_tid {
bool active;
};
struct ar9170_tx_queue_stats {
unsigned int len;
unsigned int limit;
unsigned int count;
};
#define AR9170_QUEUE_TIMEOUT 64
#define AR9170_TX_TIMEOUT 8
#define AR9170_BA_TIMEOUT 4
@ -211,7 +217,7 @@ struct ar9170 {
/* qos queue settings */
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];
spinlock_t cmdlock;

13
drivers/net/wireless/ath/ar9170/main.c
View File

@ -2396,18 +2396,6 @@ static int ar9170_get_stats(struct ieee80211_hw *hw,
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,
const struct ieee80211_tx_queue_params *param)
{
@ -2509,7 +2497,6 @@ static const struct ieee80211_ops ar9170_ops = {
.set_key = ar9170_set_key,
.sta_notify = ar9170_sta_notify,
.get_stats = ar9170_get_stats,
.get_tx_stats = ar9170_get_tx_stats,
.ampdu_action = ar9170_ampdu_action,
};