All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kalle Valo <kalle.valo@iki.fi>
To: linux-wireless@vger.kernel.org
Cc: Christian Lamparter <chunkeey@web.de>
Subject: [PATCH 03/10] ar9170: remove get_tx_stats() mac80211 op
Date: Sun, 07 Feb 2010 10:21:00 +0200	[thread overview]
Message-ID: <20100207082100.31474.30105.stgit@tikku> (raw)
In-Reply-To: <20100207082044.31474.48583.stgit@tikku>

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.

Cc: Christian Lamparter <chunkeey@web.de>
Signed-off-by: Kalle Valo <kalle.valo@iki.fi>
---
 drivers/net/wireless/ath/ar9170/ar9170.h |    8 +++++++-
 drivers/net/wireless/ath/ar9170/main.c   |   13 -------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/drivers/net/wireless/ath/ar9170/ar9170.h b/drivers/net/wireless/ath/ar9170/ar9170.h
index 04525ff..dc662b7 100644
--- a/drivers/net/wireless/ath/ar9170/ar9170.h
+++ b/drivers/net/wireless/ath/ar9170/ar9170.h
@@ -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
@@ -212,7 +218,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;
diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c
index b8a482c..2b67b03 100644
--- a/drivers/net/wireless/ath/ar9170/main.c
+++ b/drivers/net/wireless/ath/ar9170/main.c
@@ -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,
 };
 


  parent reply	other threads:[~2010-02-07  8:21 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-07  8:20 [PATCH 01/10] adm821: remove get_tx_stats() mac80211 op Kalle Valo
2010-02-07  8:20 ` [PATCH 02/10] mwl8k: " Kalle Valo
2010-02-07  8:21 ` Kalle Valo [this message]
2010-02-07 13:53   ` [PATCH 03/10] ar9170: " Christian Lamparter
2010-02-07  8:21 ` [PATCH 04/10] ath5k: " Kalle Valo
2010-02-07 15:04   ` Bob Copeland
2010-02-07  8:21 ` [PATCH 05/10] b43: " Kalle Valo
2010-02-07 11:32   ` Michael Buesch
2010-02-07 17:02     ` Kalle Valo
2010-02-07 17:50       ` [PATCH v2 1/2] " Kalle Valo
2010-02-07 18:42         ` Kalle Valo
2010-02-07 17:51       ` [PATCH v2 2/2] b43legacy: " Kalle Valo
2010-02-07 18:40         ` Kalle Valo
2010-02-07  8:21 ` [PATCH 06/10] " Kalle Valo
2010-02-07  8:21 ` [PATCH 07/10] iwlwifi: " Kalle Valo
2010-02-08 17:09   ` reinette chatre
2010-02-07  8:21 ` [PATCH 08/10] p54: " Kalle Valo
2010-02-07 13:52   ` Christian Lamparter
2010-02-07  8:21 ` [PATCH 09/10] rt2x00: " Kalle Valo
2010-02-07 11:52   ` Gertjan van Wingerde
2010-02-07 17:04     ` Kalle Valo
2010-02-08 20:15       ` Gertjan van Wingerde
2010-02-07 14:03   ` Ivo van Doorn
2010-02-07  8:22 ` [PATCH 10/10] mac80211: remove get_tx_stats() driver op Kalle Valo
2010-02-08  9:25   ` Johannes Berg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100207082100.31474.30105.stgit@tikku \
    --to=kalle.valo@iki.fi \
    --cc=chunkeey@web.de \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.