Skip to contentSkip to conversation

d80211: remove unused Super AG definitions, purge comment

PATCH In review David Kimdon 2 participants 3 messages Oct 16, 2006 – Oct 17, 2006

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

David Kimdon

author
#0 lore raw

PATCH 1/1 d80211: remove unused Super AG definitions, purge comment

Remove unused Super AG structure members, enums.

In struct ieee80211_tx_status the queue_length and queue_number could be useful outside the context of Super AG, so remove the comment and leave the members.

Signed-off-by David Kimdon <[email protected]>
include/net/d80211.h +0 -14
Index: wireless-dev/include/net/d80211.h
===================================================================
@@ -159,12 +159,6 @@ struct ieee80211_tx_control {
 	unsigned int requeue:1;
 	unsigned int first_fragment:1;	/* This is a first fragment of the
 					 * frame */
-	 /* following three flags are only used with Atheros Super A/G */
-	unsigned int compress:1;
-	unsigned int turbo_prime_notify:1; /* notify HostAPd after frame
-					    * transmission */
-	unsigned int fast_frame:1;
-
         unsigned int power_level:8; /* per-packet transmit power level, in dBm
 				     */
 	unsigned int antenna_sel:4; /* 0 = default/diversity,

@@ -219,7 +213,6 @@ struct ieee80211_tx_status {
 	int excessive_retries;
 	int retry_count;
 
-	/* following two fields are only used with Atheros Super A/G */
 	int queue_length;      /* information about TX queue */
 	int queue_number;
 };

@@ -265,13 +258,6 @@ struct ieee80211_conf {
         int antenna_def;
         int antenna_mode;
 
-	int atheros_super_ag_compression;
-	int atheros_super_ag_fast_frame;
-	int atheros_super_ag_burst;
-	int atheros_super_ag_wme_ele;
-	int atheros_super_ag_turbo_g;
-	int atheros_super_ag_turbo_prime;
-
 	/* Following five fields are used for IEEE 802.11H */
 	unsigned int radar_detect;
 	unsigned int spect_mgmt;
net/d80211/hostapd_ioctl.h +0 -4
Index: wireless-dev/net/d80211/hostapd_ioctl.h
===================================================================
@@ -182,10 +182,6 @@ struct prism2_hostapd_param {
 			u16 aid;
 			u16 capability;
 			u8 supp_rates[32];
-			/* atheros_super_ag and enc_flags are only used with
-			 * IEEE80211_ATHEROS_SUPER_AG
-			 */
-			u8 atheros_super_ag;
 			u8 wds_flags;
 #define IEEE80211_STA_DYNAMIC_ENC BIT(0)
 			u8 enc_flags;
include/net/d80211_shared.h +0 -2
Index: wireless-dev/include/net/d80211_shared.h
===================================================================
@@ -19,8 +19,6 @@ enum {
 	MODE_ATHEROS_TURBO = 2 /* Atheros Turbo mode (2x.11a at 5 GHz) */,
 	MODE_IEEE80211G = 3 /* IEEE 802.11g (and 802.11b compatibility) */,
 	MODE_ATHEROS_TURBOG = 4 /* Atheros Turbo mode (2x.11g at 2.4 GHz) */,
-	MODE_ATHEROS_PRIME = 5 /* Atheros Dynamic Turbo mode */,
-	MODE_ATHEROS_PRIMEG = 6 /* Atheros Dynamic Turbo mode G */,
 	NUM_IEEE80211_MODES = 7
 };

--

#1 lore raw

include/net/d80211_shared.h enum { · line 22

Quoted 3 lines · David Kimdon
include/net/d80211_shared.h +0 -2
-	MODE_ATHEROS_PRIME = 5 /* Atheros Dynamic Turbo mode */,
-	MODE_ATHEROS_PRIMEG = 6 /* Atheros Dynamic Turbo mode G */,
 	NUM_IEEE80211_MODES = 7

You want to adjust that last constant there too, I guess. Why is it an enum anyway if things are assigned statically?

johannes

author
#2 lore raw

Re: [PATCH] d80211: remove unused Super AG definitions, purgecomment

Quoted 2 lines · Johannes Berg

On Mon, 2006-10-16 at 11:39 -0700, David Kimdon wrote:
You want to adjust that last constant there too, I guess.

Indeed, updated patch inline.

Quoted 2 lines

Why is it an
enum anyway if things are assigned statically?

I don't have a good answer for that.

-David

Remove unused Super AG structure members, enums.

In struct ieee80211_tx_status the queue_length and queue_number could be useful outside the context of Super AG, so remove the comment and leave the members.

Signed-off-by David Kimdon <[email protected]>
include/net/d80211.h +0 -14
Index: wireless-dev/include/net/d80211.h
===================================================================
@@ -159,12 +159,6 @@ struct ieee80211_tx_control {
 	unsigned int requeue:1;
 	unsigned int first_fragment:1;	/* This is a first fragment of the
 					 * frame */
-	 /* following three flags are only used with Atheros Super A/G */
-	unsigned int compress:1;
-	unsigned int turbo_prime_notify:1; /* notify HostAPd after frame
-					    * transmission */
-	unsigned int fast_frame:1;
-
         unsigned int power_level:8; /* per-packet transmit power level, in dBm
 				     */
 	unsigned int antenna_sel:4; /* 0 = default/diversity,

@@ -219,7 +213,6 @@ struct ieee80211_tx_status {
 	int excessive_retries;
 	int retry_count;
 
-	/* following two fields are only used with Atheros Super A/G */
 	int queue_length;      /* information about TX queue */
 	int queue_number;
 };

@@ -265,13 +258,6 @@ struct ieee80211_conf {
         int antenna_def;
         int antenna_mode;
 
-	int atheros_super_ag_compression;
-	int atheros_super_ag_fast_frame;
-	int atheros_super_ag_burst;
-	int atheros_super_ag_wme_ele;
-	int atheros_super_ag_turbo_g;
-	int atheros_super_ag_turbo_prime;
-
 	/* Following five fields are used for IEEE 802.11H */
 	unsigned int radar_detect;
 	unsigned int spect_mgmt;
net/d80211/hostapd_ioctl.h +0 -4
Index: wireless-dev/net/d80211/hostapd_ioctl.h
===================================================================
@@ -182,10 +182,6 @@ struct prism2_hostapd_param {
 			u16 aid;
 			u16 capability;
 			u8 supp_rates[32];
-			/* atheros_super_ag and enc_flags are only used with
-			 * IEEE80211_ATHEROS_SUPER_AG
-			 */
-			u8 atheros_super_ag;
 			u8 wds_flags;
 #define IEEE80211_STA_DYNAMIC_ENC BIT(0)
 			u8 enc_flags;
include/net/d80211_shared.h +1 -3
Index: wireless-dev/include/net/d80211_shared.h
===================================================================
@@ -19,9 +19,7 @@ enum {
 	MODE_ATHEROS_TURBO = 2 /* Atheros Turbo mode (2x.11a at 5 GHz) */,
 	MODE_IEEE80211G = 3 /* IEEE 802.11g (and 802.11b compatibility) */,
 	MODE_ATHEROS_TURBOG = 4 /* Atheros Turbo mode (2x.11g at 2.4 GHz) */,
-	MODE_ATHEROS_PRIME = 5 /* Atheros Dynamic Turbo mode */,
-	MODE_ATHEROS_PRIMEG = 6 /* Atheros Dynamic Turbo mode G */,
-	NUM_IEEE80211_MODES = 7
+	NUM_IEEE80211_MODES = 5
 };
 
 #define IEEE80211_CHAN_W_SCAN 0x00000001