From: Gertjan van Wingerde <gwingerde@gmail.com>
To: Kalle Valo <kalle.valo@iki.fi>
Cc: linux-wireless@vger.kernel.org, Ivo van Doorn <IvDoorn@gmail.com>
Subject: Re: [PATCH 09/10] rt2x00: remove get_tx_stats() mac80211 op
Date: Sun, 07 Feb 2010 12:52:48 +0100 [thread overview]
Message-ID: <4B6EA990.30801@gmail.com> (raw)
In-Reply-To: <20100207082153.31474.76058.stgit@tikku>
On 02/07/10 09:21, Kalle Valo wrote:
> get_tx_stats() will be removed from mac80211.
>
> Compile-tested only.
>
> Cc: Ivo van Doorn <IvDoorn@gmail.com>
> Cc: Gertjan van Wingerde <gwingerde@gmail.com>
> Signed-off-by: Kalle Valo <kalle.valo@iki.fi>
> ---
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Although I seem to be missing the actual removal of the
get_tx_stats from mac80211.
---
Gertjan.
> drivers/net/wireless/rt2x00/rt2400pci.c | 1 -
> drivers/net/wireless/rt2x00/rt2500pci.c | 1 -
> drivers/net/wireless/rt2x00/rt2500usb.c | 1 -
> drivers/net/wireless/rt2x00/rt2800lib.c | 1 -
> drivers/net/wireless/rt2x00/rt2x00.h | 2 --
> drivers/net/wireless/rt2x00/rt2x00mac.c | 16 ----------------
> drivers/net/wireless/rt2x00/rt61pci.c | 1 -
> drivers/net/wireless/rt2x00/rt73usb.c | 1 -
> 8 files changed, 0 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
> index d86d233..1843359 100644
> --- a/drivers/net/wireless/rt2x00/rt2400pci.c
> +++ b/drivers/net/wireless/rt2x00/rt2400pci.c
> @@ -1561,7 +1561,6 @@ static const struct ieee80211_ops rt2400pci_mac80211_ops = {
> .get_stats = rt2x00mac_get_stats,
> .bss_info_changed = rt2x00mac_bss_info_changed,
> .conf_tx = rt2400pci_conf_tx,
> - .get_tx_stats = rt2x00mac_get_tx_stats,
> .get_tsf = rt2400pci_get_tsf,
> .tx_last_beacon = rt2400pci_tx_last_beacon,
> .rfkill_poll = rt2x00mac_rfkill_poll,
> diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
> index 46cbc6e..7dfcffa 100644
> --- a/drivers/net/wireless/rt2x00/rt2500pci.c
> +++ b/drivers/net/wireless/rt2x00/rt2500pci.c
> @@ -1859,7 +1859,6 @@ static const struct ieee80211_ops rt2500pci_mac80211_ops = {
> .get_stats = rt2x00mac_get_stats,
> .bss_info_changed = rt2x00mac_bss_info_changed,
> .conf_tx = rt2x00mac_conf_tx,
> - .get_tx_stats = rt2x00mac_get_tx_stats,
> .get_tsf = rt2500pci_get_tsf,
> .tx_last_beacon = rt2500pci_tx_last_beacon,
> .rfkill_poll = rt2x00mac_rfkill_poll,
> diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
> index 9e6f865..81ca4ec 100644
> --- a/drivers/net/wireless/rt2x00/rt2500usb.c
> +++ b/drivers/net/wireless/rt2x00/rt2500usb.c
> @@ -1761,7 +1761,6 @@ static const struct ieee80211_ops rt2500usb_mac80211_ops = {
> .get_stats = rt2x00mac_get_stats,
> .bss_info_changed = rt2x00mac_bss_info_changed,
> .conf_tx = rt2x00mac_conf_tx,
> - .get_tx_stats = rt2x00mac_get_tx_stats,
> .rfkill_poll = rt2x00mac_rfkill_poll,
> };
>
> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> index 529a373..a45e027 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -2297,7 +2297,6 @@ const struct ieee80211_ops rt2800_mac80211_ops = {
> .set_rts_threshold = rt2800_set_rts_threshold,
> .bss_info_changed = rt2x00mac_bss_info_changed,
> .conf_tx = rt2800_conf_tx,
> - .get_tx_stats = rt2x00mac_get_tx_stats,
> .get_tsf = rt2800_get_tsf,
> .rfkill_poll = rt2x00mac_rfkill_poll,
> };
> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
> index 096da85..43b70c6 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> @@ -1044,8 +1044,6 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
> #endif /* CONFIG_RT2X00_LIB_CRYPTO */
> int rt2x00mac_get_stats(struct ieee80211_hw *hw,
> struct ieee80211_low_level_stats *stats);
> -int rt2x00mac_get_tx_stats(struct ieee80211_hw *hw,
> - struct ieee80211_tx_queue_stats *stats);
> void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
> struct ieee80211_vif *vif,
> struct ieee80211_bss_conf *bss_conf,
> diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
> index 00f1f93..abbd857 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00mac.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
> @@ -555,22 +555,6 @@ int rt2x00mac_get_stats(struct ieee80211_hw *hw,
> }
> EXPORT_SYMBOL_GPL(rt2x00mac_get_stats);
>
> -int rt2x00mac_get_tx_stats(struct ieee80211_hw *hw,
> - struct ieee80211_tx_queue_stats *stats)
> -{
> - struct rt2x00_dev *rt2x00dev = hw->priv;
> - unsigned int i;
> -
> - for (i = 0; i < rt2x00dev->ops->tx_queues; i++) {
> - stats[i].len = rt2x00dev->tx[i].length;
> - stats[i].limit = rt2x00dev->tx[i].limit;
> - stats[i].count = rt2x00dev->tx[i].count;
> - }
> -
> - return 0;
> -}
> -EXPORT_SYMBOL_GPL(rt2x00mac_get_tx_stats);
> -
> void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw,
> struct ieee80211_vif *vif,
> struct ieee80211_bss_conf *bss_conf,
> diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
> index c353b49..8813400 100644
> --- a/drivers/net/wireless/rt2x00/rt61pci.c
> +++ b/drivers/net/wireless/rt2x00/rt61pci.c
> @@ -2730,7 +2730,6 @@ static const struct ieee80211_ops rt61pci_mac80211_ops = {
> .get_stats = rt2x00mac_get_stats,
> .bss_info_changed = rt2x00mac_bss_info_changed,
> .conf_tx = rt61pci_conf_tx,
> - .get_tx_stats = rt2x00mac_get_tx_stats,
> .get_tsf = rt61pci_get_tsf,
> .rfkill_poll = rt2x00mac_rfkill_poll,
> };
> diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
> index a026912..3781eb7 100644
> --- a/drivers/net/wireless/rt2x00/rt73usb.c
> +++ b/drivers/net/wireless/rt2x00/rt73usb.c
> @@ -2245,7 +2245,6 @@ static const struct ieee80211_ops rt73usb_mac80211_ops = {
> .get_stats = rt2x00mac_get_stats,
> .bss_info_changed = rt2x00mac_bss_info_changed,
> .conf_tx = rt73usb_conf_tx,
> - .get_tx_stats = rt2x00mac_get_tx_stats,
> .get_tsf = rt73usb_get_tsf,
> .rfkill_poll = rt2x00mac_rfkill_poll,
> };
>
>
next prev parent reply other threads:[~2010-02-07 11:52 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 ` [PATCH 03/10] ar9170: " Kalle Valo
2010-02-07 13:53 ` 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 [this message]
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=4B6EA990.30801@gmail.com \
--to=gwingerde@gmail.com \
--cc=IvDoorn@gmail.com \
--cc=kalle.valo@iki.fi \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).