Skip to contentSkip to conversation

staging: r8188eu: remove unused struct declarations

PATCH In review Deepak R Varma 2 participants 5 messages Nov 2, 2022 – Nov 4, 2022 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: r8188eu: remove unused struct declarations

Some structures are only declared but have not been used anywhere in the code. Remove such unused structs. Issue identified as part of coccicheck report driven code investigation.

---
 drivers/staging/r8188eu/include/wlan_bssdef.h | 42 -------------------
 1 file changed, 42 deletions(-)
drivers/staging/r8188eu/include/wlan_bssdef.h +0 -42
index 831c465df500..ffeafa19ef26 100644
@@ -177,20 +177,6 @@ struct ndis_802_11_status_ind {
 /*  MIC check time, 60 seconds. */
 #define MIC_CHECK_TIME	60000000
 
-struct ndis_802_11_auth_evt {
-	struct ndis_802_11_status_ind       Status;
-	struct ndis_802_11_auth_req  Request[1];
-};
-
-struct ndis_802_11_test {
-	u32 Length;
-	u32 Type;
-	union {
-		struct ndis_802_11_auth_evt AuthenticationEvent;
-		NDIS_802_11_RSSI RssiTrigger;
-	} tt;
-};
-
 #ifndef Ndis802_11APMode
 #define Ndis802_11APMode (Ndis802_11InfrastructureMax+1)
 #endif
@@ -279,34 +265,6 @@ enum UAPSD_MAX_SP {
 #define NUM_PRE_AUTH_KEY 16
 #define NUM_PMKID_CACHE NUM_PRE_AUTH_KEY
 
-/*
-*	WPA2
-*/
-
-struct pmkid_candidate {
-	unsigned char BSSID[ETH_ALEN];
-	u32 Flags;
-};
-
-struct ndis_802_11_pmkid_list {
-	u32 Version;       /*  Version of the structure */
-	u32 NumCandidates; /*  No. of pmkid candidates */
-	struct pmkid_candidate CandidateList[1];
-};
-
-struct ndis_802_11_auth_encrypt {
-	enum ndis_802_11_auth_mode AuthModeSupported;
-	enum ndis_802_11_wep_status EncryptStatusSupported;
-};
-
-struct ndis_802_11_cap {
-	u32  Length;
-	u32  Version;
-	u32  NoOfPMKIDs;
-	u32  NoOfAuthEncryptPairsSupported;
-	struct ndis_802_11_auth_encrypt AuthenticationEncryptionSupported[1];
-};
-
 u8 key_2char2num(u8 hch, u8 lch);
 u8 key_char2num(u8 ch);
 u8 str_2char2num(u8 hch, u8 lch);

--
2.34.1

Tested-by on v1 1/1
#1 lore raw
Quoted 72 lines · Deepak R Varma

Some structures are only declared but have not been used anywhere in the code. Remove such unused structs. Issue identified as part of coccicheck report driven code investigation.

---
  drivers/staging/r8188eu/include/wlan_bssdef.h | 42 -------------------
  1 file changed, 42 deletions(-)
drivers/staging/r8188eu/include/wlan_bssdef.h +0 -43
index 831c465df500..ffeafa19ef26 100644
@@ -177,20 +177,6 @@ struct ndis_802_11_status_ind {
  /*  MIC check time, 60 seconds. */
  #define MIC_CHECK_TIME	60000000
 
-struct ndis_802_11_auth_evt {
-	struct ndis_802_11_status_ind       Status;
-	struct ndis_802_11_auth_req  Request[1];
-};
-
-struct ndis_802_11_test {
-	u32 Length;
-	u32 Type;
-	union {
-		struct ndis_802_11_auth_evt AuthenticationEvent;
-		NDIS_802_11_RSSI RssiTrigger;
-	} tt;
-};
-
  #ifndef Ndis802_11APMode
  #define Ndis802_11APMode (Ndis802_11InfrastructureMax+1)
  #endif
@@ -279,34 +265,6 @@ enum UAPSD_MAX_SP {
  #define NUM_PRE_AUTH_KEY 16
  #define NUM_PMKID_CACHE NUM_PRE_AUTH_KEY
 
-/*
-*	WPA2
-*/
-
-struct pmkid_candidate {
-	unsigned char BSSID[ETH_ALEN];
-	u32 Flags;
-};
-
-struct ndis_802_11_pmkid_list {
-	u32 Version;       /*  Version of the structure */
-	u32 NumCandidates; /*  No. of pmkid candidates */
-	struct pmkid_candidate CandidateList[1];
-};
-
-struct ndis_802_11_auth_encrypt {
-	enum ndis_802_11_auth_mode AuthModeSupported;
-	enum ndis_802_11_wep_status EncryptStatusSupported;
-};
-
-struct ndis_802_11_cap {
-	u32  Length;
-	u32  Version;
-	u32  NoOfPMKIDs;
-	u32  NoOfAuthEncryptPairsSupported;
-	struct ndis_802_11_auth_encrypt AuthenticationEncryptionSupported[1];
-};
-
  u8 key_2char2num(u8 hch, u8 lch);
  u8 key_char2num(u8 ch);
  u8 str_2char2num(u8 hch, u8 lch);
--
Quoted 5 lines

2.34.1

#2 lore raw
Quoted 7 lines · Philipp Hortmann
Quoted 4 lines · Deepak R Varma

Some structures are only declared but have not been used anywhere in the code. Remove such unused structs. Issue identified as part of coccicheck report driven code investigation.

Hello Philipp,
Thank you for testing the changes.

Request (not urgent):
Can you please help me understand how do you
test such changes? Do we need specific hardware for functional tests? Is there a documentation available to know more about the testing? I am interested in attaching a physical device to my machine and be able to debug and test the changes. Can you please provide details when you have time?

Thank you in advance!
./drv

Quoted 1 line
#3 lore raw
Quoted 10 lines · Deepak R Varma

Hello Philipp,
Thank you for testing the changes.

Request (not urgent):
Can you please help me understand how do you
test such changes? Do we need specific hardware for functional tests? Is there a documentation available to know more about the testing? I am interested in attaching a physical device to my machine and be able to debug and test the changes. Can you please provide details when you have time?

Quoted 2 lines

Thank you in advance!
./drv

Hi Deepak,

I do have one device for the following drivers:

vt6656
vt6655
r8188eu
r8192e_pci
r8712u

Minimum test is to measure the transfer speed and see if that is as expected.

When I doubt that the changed code is used I use ftrace to see if the code is used. But of course I do not test every possibility.

I hope you have the money to be able to buy hardware. Without it is not fun.

I would choose r8188eu (USB) or r8192e_pci.

Bye Philipp

#4 lore raw
Quoted 16 lines · Philipp Hortmann
Quoted 10 lines · Deepak R Varma

Hello Philipp,
Thank you for testing the changes.

Request (not urgent):
Can you please help me understand how do you
test such changes? Do we need specific hardware for functional tests? Is there a documentation available to know more about the testing? I am interested in attaching a physical device to my machine and be able to debug and test the changes. Can you please provide details when you have time?

Quoted 2 lines

Thank you in advance!
./drv

Hi Deepak,

Quoted 7 lines

I do have one device for the following drivers:

vt6656
vt6655
r8188eu
r8192e_pci
r8712u

Wow... that sounds like a very useful set (and a lot of testing time :) )

Quoted 6 lines

Minimum test is to measure the transfer speed and see if that is as expected.

When I doubt that the changed code is used I use ftrace to see if the code is used. But of course I do not test every possibility.

Okay. May be as I gain more knowledge, I will be able to apply it as well. I hope it will be okay to connect with you in future if an opportunity arises.

Quoted 4 lines

I hope you have the money to be able to buy hardware. Without it is not fun.

I would choose r8188eu (USB) or r8192e_pci.

Thank you so much for the recommendation. I will find out the cost and see if I can buy one of those.

Have a great weekend!
./drv

Quoted 3 lines

Bye Philipp