Skip to contentSkip to conversation

staging: rtl8723bs: remove unused NDIS_802_11 typedefs

PATCH Superseded Malathi 2 participants 3 messages Aug 18 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Malathi

author
#0 lore raw

PATCH 1/2 staging: rtl8723bs: remove unused NDIS_802_11 typedefs

The 'NDIS_802_11_RATES' and 'NDIS_802_11_PMKID_VALUE' types have no users anywhere in the tree, only their typedef declarations remain. Remove both, together with the 'NDIS_802_11_LENGTH_RATES' definition whose only user was the 'NDIS_802_11_RATES' typedef.

This addresses part of the "convert any remaining unusual variable types" entry in the driver TODO.

Signed-off-by Malathi <[email protected]>
---
 drivers/staging/rtl8723bs/include/rtw_ioctl_set.h | 2 --
 drivers/staging/rtl8723bs/include/wlan_bssdef.h   | 2 --
 2 files changed, 4 deletions(-)
drivers/staging/rtl8723bs/include/rtw_ioctl_set.h +0 -2
index c3a1d1a84f78..d8dd4b6d7aca 100644
@@ -7,8 +7,6 @@
 #ifndef __RTW_IOCTL_SET_H_
 #define __RTW_IOCTL_SET_H_
 
-typedef u8 NDIS_802_11_PMKID_VALUE[16];
-
 u8 rtw_set_802_11_authentication_mode(struct adapter *pdapter, enum ndis_802_11_authentication_mode authmode);
 u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep);
 u8 rtw_set_802_11_disassociate(struct adapter *padapter);
drivers/staging/rtl8723bs/include/wlan_bssdef.h +0 -2
index 812a68394268..4b14eb0caa03 100644
@@ -12,10 +12,8 @@
 
 
 #define NDIS_802_11_LENGTH_SSID         32
-#define NDIS_802_11_LENGTH_RATES        8
 #define NDIS_802_11_LENGTH_RATES_EX     16
 
-typedef unsigned char   NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES];        /*  Set of 8 data rates */
 typedef unsigned char   NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX];  /*  Set of 16 data rates */
 
 struct ndis_802_11_ssid {
Signature · 1 line
2.43.0
author
#1 lore raw

PATCH 2/2 staging: rtl8723bs: remove unusual 'NDIS_802_11_RATES_EX' type

Remove the 'NDIS_802_11_RATES_EX' type and replace the variables of this type with an array of 'u8', which makes the code more understandable and gets rid of an unnecessary 'typedef'.

'u8' and the 'unsigned char' the typedef expanded to are the same type and the array length is unchanged, so there is no functional change. Also update the comment in wlan_bssdef.h that referred to the removed type.

Signed-off-by Malathi <[email protected]>
---
 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 +-
 drivers/staging/rtl8723bs/include/wlan_bssdef.h  | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +1 -1
index cb23c6939bfc..61ce0f8708a6 100644
@@ -253,7 +253,7 @@ struct FW_Sta_Info {
 	u32 status;
 	u32 rx_pkt;
 	u32 retry;
-	NDIS_802_11_RATES_EX  SupportedRates;
+	u8  SupportedRates[NDIS_802_11_LENGTH_RATES_EX];
 };
 
 /*
drivers/staging/rtl8723bs/include/wlan_bssdef.h +2 -4
index 4b14eb0caa03..791eee4e75b3 100644
@@ -14,8 +14,6 @@
 #define NDIS_802_11_LENGTH_SSID         32
 #define NDIS_802_11_LENGTH_RATES_EX     16
 
-typedef unsigned char   NDIS_802_11_RATES_EX[NDIS_802_11_LENGTH_RATES_EX];  /*  Set of 16 data rates */
-
 struct ndis_802_11_ssid {
 	u32  ssid_length;
 	u8  ssid[32];

@@ -64,7 +62,7 @@ struct ndis_80211_var_ie {
  * ETH_ALEN + 2 +
  * sizeof (struct ndis_802_11_ssid) + sizeof (u32) +
  * sizeof (long) + sizeof (enum ndis_802_11_network_type) +
- * sizeof (struct ndis_802_11_conf) + sizeof (NDIS_802_11_RATES_EX) + ie_length
+ * sizeof (struct ndis_802_11_conf) + NDIS_802_11_LENGTH_RATES_EX + ie_length
  *
  * Except for ie_length, all other fields are fixed length. Therefore, we can
  * define a macro to present the partial sum.

@@ -160,7 +158,7 @@ struct wlan_bssid_ex {
 	enum ndis_802_11_network_type  network_type_in_use;
 	struct ndis_802_11_conf  configuration;
 	enum ndis_802_11_network_infrastructure  infrastructure_mode;
-	NDIS_802_11_RATES_EX  supported_rates;
+	u8  supported_rates[NDIS_802_11_LENGTH_RATES_EX];
 	struct wlan_phy_info phy_info;
 	u32  ie_length;
 	u8  ies[MAX_IE_SZ];	/* timestamp, beacon interval, and capability information) */
Signature · 1 line
2.43.0
#2 lore raw

Re: [PATCH 2/2] staging: rtl8723bs: remove unusual 'NDIS_802_11_RATES_EX' type

Quoted 9 lines · Malathi

Remove the 'NDIS_802_11_RATES_EX' type and replace the variables of this type with an array of 'u8', which makes the code more understandable and gets rid of an unnecessary 'typedef'.

'u8' and the 'unsigned char' the typedef expanded to are the same type and the array length is unchanged, so there is no functional change. Also update the comment in wlan_bssdef.h that referred to the removed type.

Signed-off-by Malathi <[email protected]>

Do you sign legal documents with just the one name?

This doesn't apply. Please, work against staging-devel or linux-next.

regards,
dan carpenter