diff options
author | Kalle Valo <kalle.valo@iki.fi> | 2010-02-07 03:21:53 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-02-08 16:51:01 -0500 |
commit | 00a08eb62f790383bcc8ea309d4afb9ef346ef0b (patch) | |
tree | 0f5daf700d46802174db477387ef79f3eb3bf6d6 | |
parent | 97e93fcd866ee7cc02082fc62509378f50547936 (diff) |
rt2x00: remove get_tx_stats() mac80211 op
get_tx_stats() will be removed from mac80211.
Compile-tested only.
Signed-off-by: Kalle Valo <kalle.valo@iki.fi>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2400pci.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2500pci.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2500usb.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00mac.c | 16 | ||||
-rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 1 | ||||
-rw-r--r-- | 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 d86d233c6810..184335950825 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 = { | |||
1561 | .get_stats = rt2x00mac_get_stats, | 1561 | .get_stats = rt2x00mac_get_stats, |
1562 | .bss_info_changed = rt2x00mac_bss_info_changed, | 1562 | .bss_info_changed = rt2x00mac_bss_info_changed, |
1563 | .conf_tx = rt2400pci_conf_tx, | 1563 | .conf_tx = rt2400pci_conf_tx, |
1564 | .get_tx_stats = rt2x00mac_get_tx_stats, | ||
1565 | .get_tsf = rt2400pci_get_tsf, | 1564 | .get_tsf = rt2400pci_get_tsf, |
1566 | .tx_last_beacon = rt2400pci_tx_last_beacon, | 1565 | .tx_last_beacon = rt2400pci_tx_last_beacon, |
1567 | .rfkill_poll = rt2x00mac_rfkill_poll, | 1566 | .rfkill_poll = rt2x00mac_rfkill_poll, |
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c index 46cbc6ef66ab..7dfcffadda2a 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 = { | |||
1859 | .get_stats = rt2x00mac_get_stats, | 1859 | .get_stats = rt2x00mac_get_stats, |
1860 | .bss_info_changed = rt2x00mac_bss_info_changed, | 1860 | .bss_info_changed = rt2x00mac_bss_info_changed, |
1861 | .conf_tx = rt2x00mac_conf_tx, | 1861 | .conf_tx = rt2x00mac_conf_tx, |
1862 | .get_tx_stats = rt2x00mac_get_tx_stats, | ||
1863 | .get_tsf = rt2500pci_get_tsf, | 1862 | .get_tsf = rt2500pci_get_tsf, |
1864 | .tx_last_beacon = rt2500pci_tx_last_beacon, | 1863 | .tx_last_beacon = rt2500pci_tx_last_beacon, |
1865 | .rfkill_poll = rt2x00mac_rfkill_poll, | 1864 | .rfkill_poll = rt2x00mac_rfkill_poll, |
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index 9e6f865c57f2..81ca4ec068db 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 = { | |||
1761 | .get_stats = rt2x00mac_get_stats, | 1761 | .get_stats = rt2x00mac_get_stats, |
1762 | .bss_info_changed = rt2x00mac_bss_info_changed, | 1762 | .bss_info_changed = rt2x00mac_bss_info_changed, |
1763 | .conf_tx = rt2x00mac_conf_tx, | 1763 | .conf_tx = rt2x00mac_conf_tx, |
1764 | .get_tx_stats = rt2x00mac_get_tx_stats, | ||
1765 | .rfkill_poll = rt2x00mac_rfkill_poll, | 1764 | .rfkill_poll = rt2x00mac_rfkill_poll, |
1766 | }; | 1765 | }; |
1767 | 1766 | ||
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 529a37364eb0..a45e027f2d1f 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 = { | |||
2297 | .set_rts_threshold = rt2800_set_rts_threshold, | 2297 | .set_rts_threshold = rt2800_set_rts_threshold, |
2298 | .bss_info_changed = rt2x00mac_bss_info_changed, | 2298 | .bss_info_changed = rt2x00mac_bss_info_changed, |
2299 | .conf_tx = rt2800_conf_tx, | 2299 | .conf_tx = rt2800_conf_tx, |
2300 | .get_tx_stats = rt2x00mac_get_tx_stats, | ||
2301 | .get_tsf = rt2800_get_tsf, | 2300 | .get_tsf = rt2800_get_tsf, |
2302 | .rfkill_poll = rt2x00mac_rfkill_poll, | 2301 | .rfkill_poll = rt2x00mac_rfkill_poll, |
2303 | }; | 2302 | }; |
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index 096da85a66fa..43b70c6e4e9c 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, | |||
1044 | #endif /* CONFIG_RT2X00_LIB_CRYPTO */ | 1044 | #endif /* CONFIG_RT2X00_LIB_CRYPTO */ |
1045 | int rt2x00mac_get_stats(struct ieee80211_hw *hw, | 1045 | int rt2x00mac_get_stats(struct ieee80211_hw *hw, |
1046 | struct ieee80211_low_level_stats *stats); | 1046 | struct ieee80211_low_level_stats *stats); |
1047 | int rt2x00mac_get_tx_stats(struct ieee80211_hw *hw, | ||
1048 | struct ieee80211_tx_queue_stats *stats); | ||
1049 | void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, | 1047 | void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, |
1050 | struct ieee80211_vif *vif, | 1048 | struct ieee80211_vif *vif, |
1051 | struct ieee80211_bss_conf *bss_conf, | 1049 | struct ieee80211_bss_conf *bss_conf, |
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index 00f1f939f1bb..abbd857ec759 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, | |||
555 | } | 555 | } |
556 | EXPORT_SYMBOL_GPL(rt2x00mac_get_stats); | 556 | EXPORT_SYMBOL_GPL(rt2x00mac_get_stats); |
557 | 557 | ||
558 | int rt2x00mac_get_tx_stats(struct ieee80211_hw *hw, | ||
559 | struct ieee80211_tx_queue_stats *stats) | ||
560 | { | ||
561 | struct rt2x00_dev *rt2x00dev = hw->priv; | ||
562 | unsigned int i; | ||
563 | |||
564 | for (i = 0; i < rt2x00dev->ops->tx_queues; i++) { | ||
565 | stats[i].len = rt2x00dev->tx[i].length; | ||
566 | stats[i].limit = rt2x00dev->tx[i].limit; | ||
567 | stats[i].count = rt2x00dev->tx[i].count; | ||
568 | } | ||
569 | |||
570 | return 0; | ||
571 | } | ||
572 | EXPORT_SYMBOL_GPL(rt2x00mac_get_tx_stats); | ||
573 | |||
574 | void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, | 558 | void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, |
575 | struct ieee80211_vif *vif, | 559 | struct ieee80211_vif *vif, |
576 | struct ieee80211_bss_conf *bss_conf, | 560 | struct ieee80211_bss_conf *bss_conf, |
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index c353b497a65d..881340026c2a 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 = { | |||
2730 | .get_stats = rt2x00mac_get_stats, | 2730 | .get_stats = rt2x00mac_get_stats, |
2731 | .bss_info_changed = rt2x00mac_bss_info_changed, | 2731 | .bss_info_changed = rt2x00mac_bss_info_changed, |
2732 | .conf_tx = rt61pci_conf_tx, | 2732 | .conf_tx = rt61pci_conf_tx, |
2733 | .get_tx_stats = rt2x00mac_get_tx_stats, | ||
2734 | .get_tsf = rt61pci_get_tsf, | 2733 | .get_tsf = rt61pci_get_tsf, |
2735 | .rfkill_poll = rt2x00mac_rfkill_poll, | 2734 | .rfkill_poll = rt2x00mac_rfkill_poll, |
2736 | }; | 2735 | }; |
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index a02691294395..3781eb7b4aa0 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 = { | |||
2245 | .get_stats = rt2x00mac_get_stats, | 2245 | .get_stats = rt2x00mac_get_stats, |
2246 | .bss_info_changed = rt2x00mac_bss_info_changed, | 2246 | .bss_info_changed = rt2x00mac_bss_info_changed, |
2247 | .conf_tx = rt73usb_conf_tx, | 2247 | .conf_tx = rt73usb_conf_tx, |
2248 | .get_tx_stats = rt2x00mac_get_tx_stats, | ||
2249 | .get_tsf = rt73usb_get_tsf, | 2248 | .get_tsf = rt73usb_get_tsf, |
2250 | .rfkill_poll = rt2x00mac_rfkill_poll, | 2249 | .rfkill_poll = rt2x00mac_rfkill_poll, |
2251 | }; | 2250 | }; |