提交 d88410a0 编写于 作者: R Rami Rosen 提交者: John W. Linville

mac80211: remove wme_tx_queue and wme_rx_queue from net/mac80211/sta_info.h

This patch removes wme_tx_queue and wme_rx_queue from struct sta_info
and from the debugfs sub-structure of struct sta_info
in net/mac80211/sta_info.h, as they are useless and not used.
Signed-off-by: NRami Rosen <ramirose@gmail.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
上级 570bdfb1
...@@ -189,7 +189,6 @@ struct sta_ampdu_mlme { ...@@ -189,7 +189,6 @@ struct sta_ampdu_mlme {
* @last_qual: qual of last received frame from this STA * @last_qual: qual of last received frame from this STA
* @last_noise: noise of last received frame from this STA * @last_noise: noise of last received frame from this STA
* @last_seq_ctrl: last received seq/frag number from this STA (per RX queue) * @last_seq_ctrl: last received seq/frag number from this STA (per RX queue)
* @wme_rx_queue: TBD
* @tx_filtered_count: TBD * @tx_filtered_count: TBD
* @tx_retry_failed: TBD * @tx_retry_failed: TBD
* @tx_retry_count: TBD * @tx_retry_count: TBD
...@@ -199,7 +198,6 @@ struct sta_ampdu_mlme { ...@@ -199,7 +198,6 @@ struct sta_ampdu_mlme {
* @tx_fragments: number of transmitted MPDUs * @tx_fragments: number of transmitted MPDUs
* @last_txrate_idx: Index of the last used transmit rate * @last_txrate_idx: Index of the last used transmit rate
* @tid_seq: TBD * @tid_seq: TBD
* @wme_tx_queue: TBD
* @ampdu_mlme: TBD * @ampdu_mlme: TBD
* @timer_to_tid: identity mapping to ID timers * @timer_to_tid: identity mapping to ID timers
* @tid_to_tx_q: map tid to tx queue * @tid_to_tx_q: map tid to tx queue
...@@ -258,9 +256,6 @@ struct sta_info { ...@@ -258,9 +256,6 @@ struct sta_info {
int last_qual; int last_qual;
int last_noise; int last_noise;
__le16 last_seq_ctrl[NUM_RX_DATA_QUEUES]; __le16 last_seq_ctrl[NUM_RX_DATA_QUEUES];
#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
unsigned int wme_rx_queue[NUM_RX_DATA_QUEUES];
#endif
/* Updated from TX status path only, no locking requirements */ /* Updated from TX status path only, no locking requirements */
unsigned long tx_filtered_count; unsigned long tx_filtered_count;
...@@ -274,9 +269,6 @@ struct sta_info { ...@@ -274,9 +269,6 @@ struct sta_info {
unsigned long tx_fragments; unsigned long tx_fragments;
unsigned int last_txrate_idx; unsigned int last_txrate_idx;
u16 tid_seq[IEEE80211_QOS_CTL_TID_MASK + 1]; u16 tid_seq[IEEE80211_QOS_CTL_TID_MASK + 1];
#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
unsigned int wme_tx_queue[NUM_RX_DATA_QUEUES];
#endif
/* /*
* Aggregation information, locked with lock. * Aggregation information, locked with lock.
...@@ -307,10 +299,6 @@ struct sta_info { ...@@ -307,10 +299,6 @@ struct sta_info {
struct dentry *num_ps_buf_frames; struct dentry *num_ps_buf_frames;
struct dentry *inactive_ms; struct dentry *inactive_ms;
struct dentry *last_seq_ctrl; struct dentry *last_seq_ctrl;
#ifdef CONFIG_MAC80211_DEBUG_COUNTERS
struct dentry *wme_rx_queue;
struct dentry *wme_tx_queue;
#endif
struct dentry *agg_status; struct dentry *agg_status;
} debugfs; } debugfs;
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册