Re: [PATCH] [RESEND] mac80211: remove wme_tx_queue and wme_rx_queue from net/mac80211/sta_info.h

["Rami Rosen" <ramirose@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1169 bytes --]

Hi,

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.


Regards,
Rami Rosen

Signed-off-by: Rami Rosen <ramirose@gmail.com>


On Fri, Sep 26, 2008 at 2:06 PM, Johannes Berg
<johannes@sipsolutions.net> wrote:
> On Thu, 2008-09-25 at 20:45 +0300, Rami Rosen wrote:
>> Hi,
>>   This patch removes wme_tx_queue and wme_rx_queue from net/mac80211/sta_info.h
>>   as they are not used. (These variable names in fact a double declaration; one
>>   is a pointer to dentry struct (for DEBUGFS) and the second is an
>> array of ints
>>  (for Extra statistics for TX/RX debugging - when setting
>>  CONFIG_MAC80211_DEBUG_COUNTERS); both are not used.
>
> Not really a double declaration since one of them is in the debugfs
> sub-structure, but yeah, useless.
>
>>
>>
>> Regards,
>> Rami Rosen
>>
>> Signed-off-by: Rami Rosen <ramirose@gmail.com>
>
> Acked-by: Johannes Berg <johannes@sipsolutions.net>
>
> but you may need to resend with a patch description appropriate for the
> changelog, I'll let John sort that out I guess.
>
> johannes
>

[-- Attachment #2: patch.txt --]
[-- Type: text/plain, Size: 1660 bytes --]

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 109db78..81c3368 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -191,7 +191,6 @@ struct sta_ampdu_mlme {
  * @last_qual: qual 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)
- * @wme_rx_queue: TBD
  * @tx_filtered_count: TBD
  * @tx_retry_failed: TBD
  * @tx_retry_count: TBD
@@ -204,7 +203,6 @@ struct sta_ampdu_mlme {
  * @tx_fragments: number of transmitted MPDUs
  * @txrate_idx: TBD
  * @last_txrate_idx: TBD
- * @wme_tx_queue: TBD
  * @ampdu_mlme: TBD
  * @timer_to_tid: identity mapping to ID timers
  * @tid_to_tx_q: map tid to tx queue
@@ -265,9 +263,6 @@ struct sta_info {
 	int last_qual;
 	int last_noise;
 	__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 */
 	unsigned long tx_filtered_count;
@@ -286,9 +281,6 @@ struct sta_info {
 	int txrate_idx;
 	int last_txrate_idx;
 	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.
@@ -319,10 +311,6 @@ struct sta_info {
 		struct dentry *num_ps_buf_frames;
 		struct dentry *inactive_ms;
 		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;
 	} debugfs;
 #endif