Commit 349e6b7289f8a3d3d5d3b859e00b41f27d1211df
Committed by
John W. Linville
John W. Linville
1 parent
00a08eb62f
Exists in
master
and in
4 other branches
mac80211: remove get_tx_stats() driver op
get_tx_stats() driver operation is not currently used anywhere in mac80211 and there are no plans to use it in the not-so-near future. So it can go without anyone missing it. Signed-off-by: Kalle Valo <kalle.valo@iki.fi> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Showing 4 changed files with 0 additions and 54 deletions Side-by-side Diff
Documentation/DocBook/mac80211.tmpl
include/net/mac80211.h
| ... | ... | @@ -117,19 +117,6 @@ |
| 117 | 117 | bool uapsd; |
| 118 | 118 | }; |
| 119 | 119 | |
| 120 | -/** | |
| 121 | - * struct ieee80211_tx_queue_stats - transmit queue statistics | |
| 122 | - * | |
| 123 | - * @len: number of packets in queue | |
| 124 | - * @limit: queue length limit | |
| 125 | - * @count: number of frames sent | |
| 126 | - */ | |
| 127 | -struct ieee80211_tx_queue_stats { | |
| 128 | - unsigned int len; | |
| 129 | - unsigned int limit; | |
| 130 | - unsigned int count; | |
| 131 | -}; | |
| 132 | - | |
| 133 | 120 | struct ieee80211_low_level_stats { |
| 134 | 121 | unsigned int dot11ACKFailureCount; |
| 135 | 122 | unsigned int dot11RTSFailureCount; |
| ... | ... | @@ -1548,13 +1535,6 @@ |
| 1548 | 1535 | * Returns a negative error code on failure. |
| 1549 | 1536 | * The callback can sleep. |
| 1550 | 1537 | * |
| 1551 | - * @get_tx_stats: Get statistics of the current TX queue status. This is used | |
| 1552 | - * to get number of currently queued packets (queue length), maximum queue | |
| 1553 | - * size (limit), and total number of packets sent using each TX queue | |
| 1554 | - * (count). The 'stats' pointer points to an array that has hw->queues | |
| 1555 | - * items. | |
| 1556 | - * The callback must be atomic. | |
| 1557 | - * | |
| 1558 | 1538 | * @get_tsf: Get the current TSF timer value from firmware/hardware. Currently, |
| 1559 | 1539 | * this is only used for IBSS mode BSSID merging and debugging. Is not a |
| 1560 | 1540 | * required function. |
| ... | ... | @@ -1648,8 +1628,6 @@ |
| 1648 | 1628 | enum sta_notify_cmd, struct ieee80211_sta *sta); |
| 1649 | 1629 | int (*conf_tx)(struct ieee80211_hw *hw, u16 queue, |
| 1650 | 1630 | const struct ieee80211_tx_queue_params *params); |
| 1651 | - int (*get_tx_stats)(struct ieee80211_hw *hw, | |
| 1652 | - struct ieee80211_tx_queue_stats *stats); | |
| 1653 | 1631 | u64 (*get_tsf)(struct ieee80211_hw *hw); |
| 1654 | 1632 | void (*set_tsf)(struct ieee80211_hw *hw, u64 tsf); |
| 1655 | 1633 | void (*reset_tsf)(struct ieee80211_hw *hw); |
net/mac80211/driver-ops.h
| ... | ... | @@ -290,14 +290,6 @@ |
| 290 | 290 | return ret; |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | -static inline int drv_get_tx_stats(struct ieee80211_local *local, | |
| 294 | - struct ieee80211_tx_queue_stats *stats) | |
| 295 | -{ | |
| 296 | - int ret = local->ops->get_tx_stats(&local->hw, stats); | |
| 297 | - trace_drv_get_tx_stats(local, stats, ret); | |
| 298 | - return ret; | |
| 299 | -} | |
| 300 | - | |
| 301 | 293 | static inline u64 drv_get_tsf(struct ieee80211_local *local) |
| 302 | 294 | { |
| 303 | 295 | u64 ret = -1ULL; |
net/mac80211/driver-trace.h
| ... | ... | @@ -630,29 +630,6 @@ |
| 630 | 630 | ) |
| 631 | 631 | ); |
| 632 | 632 | |
| 633 | -TRACE_EVENT(drv_get_tx_stats, | |
| 634 | - TP_PROTO(struct ieee80211_local *local, | |
| 635 | - struct ieee80211_tx_queue_stats *stats, | |
| 636 | - int ret), | |
| 637 | - | |
| 638 | - TP_ARGS(local, stats, ret), | |
| 639 | - | |
| 640 | - TP_STRUCT__entry( | |
| 641 | - LOCAL_ENTRY | |
| 642 | - __field(int, ret) | |
| 643 | - ), | |
| 644 | - | |
| 645 | - TP_fast_assign( | |
| 646 | - LOCAL_ASSIGN; | |
| 647 | - __entry->ret = ret; | |
| 648 | - ), | |
| 649 | - | |
| 650 | - TP_printk( | |
| 651 | - LOCAL_PR_FMT " ret:%d", | |
| 652 | - LOCAL_PR_ARG, __entry->ret | |
| 653 | - ) | |
| 654 | -); | |
| 655 | - | |
| 656 | 633 | TRACE_EVENT(drv_get_tsf, |
| 657 | 634 | TP_PROTO(struct ieee80211_local *local, u64 ret), |
| 658 | 635 |