Commit 349e6b72 authored by Kalle Valo's avatar Kalle Valo Committed by John W. Linville

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: default avatarKalle Valo <kalle.valo@iki.fi>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 00a08eb6
...@@ -234,7 +234,6 @@ usage should require reading the full document. ...@@ -234,7 +234,6 @@ usage should require reading the full document.
<title>Multiple queues and QoS support</title> <title>Multiple queues and QoS support</title>
<para>TBD</para> <para>TBD</para>
!Finclude/net/mac80211.h ieee80211_tx_queue_params !Finclude/net/mac80211.h ieee80211_tx_queue_params
!Finclude/net/mac80211.h ieee80211_tx_queue_stats
</chapter> </chapter>
<chapter id="AP"> <chapter id="AP">
......
...@@ -117,19 +117,6 @@ struct ieee80211_tx_queue_params { ...@@ -117,19 +117,6 @@ struct ieee80211_tx_queue_params {
bool uapsd; bool uapsd;
}; };
/**
* struct ieee80211_tx_queue_stats - transmit queue statistics
*
* @len: number of packets in queue
* @limit: queue length limit
* @count: number of frames sent
*/
struct ieee80211_tx_queue_stats {
unsigned int len;
unsigned int limit;
unsigned int count;
};
struct ieee80211_low_level_stats { struct ieee80211_low_level_stats {
unsigned int dot11ACKFailureCount; unsigned int dot11ACKFailureCount;
unsigned int dot11RTSFailureCount; unsigned int dot11RTSFailureCount;
...@@ -1548,13 +1535,6 @@ enum ieee80211_ampdu_mlme_action { ...@@ -1548,13 +1535,6 @@ enum ieee80211_ampdu_mlme_action {
* Returns a negative error code on failure. * Returns a negative error code on failure.
* The callback can sleep. * The callback can sleep.
* *
* @get_tx_stats: Get statistics of the current TX queue status. This is used
* to get number of currently queued packets (queue length), maximum queue
* size (limit), and total number of packets sent using each TX queue
* (count). The 'stats' pointer points to an array that has hw->queues
* items.
* The callback must be atomic.
*
* @get_tsf: Get the current TSF timer value from firmware/hardware. Currently, * @get_tsf: Get the current TSF timer value from firmware/hardware. Currently,
* this is only used for IBSS mode BSSID merging and debugging. Is not a * this is only used for IBSS mode BSSID merging and debugging. Is not a
* required function. * required function.
...@@ -1648,8 +1628,6 @@ struct ieee80211_ops { ...@@ -1648,8 +1628,6 @@ struct ieee80211_ops {
enum sta_notify_cmd, struct ieee80211_sta *sta); enum sta_notify_cmd, struct ieee80211_sta *sta);
int (*conf_tx)(struct ieee80211_hw *hw, u16 queue, int (*conf_tx)(struct ieee80211_hw *hw, u16 queue,
const struct ieee80211_tx_queue_params *params); const struct ieee80211_tx_queue_params *params);
int (*get_tx_stats)(struct ieee80211_hw *hw,
struct ieee80211_tx_queue_stats *stats);
u64 (*get_tsf)(struct ieee80211_hw *hw); u64 (*get_tsf)(struct ieee80211_hw *hw);
void (*set_tsf)(struct ieee80211_hw *hw, u64 tsf); void (*set_tsf)(struct ieee80211_hw *hw, u64 tsf);
void (*reset_tsf)(struct ieee80211_hw *hw); void (*reset_tsf)(struct ieee80211_hw *hw);
......
...@@ -290,14 +290,6 @@ static inline int drv_conf_tx(struct ieee80211_local *local, u16 queue, ...@@ -290,14 +290,6 @@ static inline int drv_conf_tx(struct ieee80211_local *local, u16 queue,
return ret; return ret;
} }
static inline int drv_get_tx_stats(struct ieee80211_local *local,
struct ieee80211_tx_queue_stats *stats)
{
int ret = local->ops->get_tx_stats(&local->hw, stats);
trace_drv_get_tx_stats(local, stats, ret);
return ret;
}
static inline u64 drv_get_tsf(struct ieee80211_local *local) static inline u64 drv_get_tsf(struct ieee80211_local *local)
{ {
u64 ret = -1ULL; u64 ret = -1ULL;
......
...@@ -630,29 +630,6 @@ TRACE_EVENT(drv_conf_tx, ...@@ -630,29 +630,6 @@ TRACE_EVENT(drv_conf_tx,
) )
); );
TRACE_EVENT(drv_get_tx_stats,
TP_PROTO(struct ieee80211_local *local,
struct ieee80211_tx_queue_stats *stats,
int ret),
TP_ARGS(local, stats, ret),
TP_STRUCT__entry(
LOCAL_ENTRY
__field(int, ret)
),
TP_fast_assign(
LOCAL_ASSIGN;
__entry->ret = ret;
),
TP_printk(
LOCAL_PR_FMT " ret:%d",
LOCAL_PR_ARG, __entry->ret
)
);
TRACE_EVENT(drv_get_tsf, TRACE_EVENT(drv_get_tsf,
TP_PROTO(struct ieee80211_local *local, u64 ret), TP_PROTO(struct ieee80211_local *local, u64 ret),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment