staging: r8188eu: remove unused constants from wifi.h
PATCH 1/2 staging: r8188eu: remove unused constants from wifi.h
The constants WLAN_REASON_PWR_CAPABILITY_NOT_VALID and WLAN_REASON_SUPPORTED_CHANNEL_NOT_VALID defined in wifi.h are unused, remove them.
--- drivers/staging/r8188eu/include/wifi.h | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/r8188eu/include/wifi.h +0 -2
@@ -126,8 +126,6 @@ enum WIFI_REASON_CODE {#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8 #define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 */ /* IEEE 802.11h */ -#define WLAN_REASON_PWR_CAPABILITY_NOT_VALID 10 -#define WLAN_REASON_SUPPORTED_CHANNEL_NOT_VALID 11/* IEEE 802.11i #define WLAN_REASON_INVALID_IE 13
Signature · 1 line
2.33.0
PATCH 2/2 staging: r8188eu: remove commented constants from wifi.h
Remove commented constants from wifi.h.
--- drivers/staging/r8188eu/include/wifi.h | 50 -------------------------- 1 file changed, 50 deletions(-)
drivers/staging/r8188eu/include/wifi.h +0 -50
@@ -114,33 +114,6 @@ enum WIFI_REASON_CODE { _RSON_TDLS_TEAR_UN_RSN_ = 26, }; -/* Reason codes (IEEE 802.11-2007, 7.3.1.7, Table 7-22) - -#define WLAN_REASON_UNSPECIFIED 1 -#define WLAN_REASON_PREV_AUTH_NOT_VALID 2 -#define WLAN_REASON_DEAUTH_LEAVING 3 -#define WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4 -#define WLAN_REASON_DISASSOC_AP_BUSY 5 -#define WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA 6 -#define WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA 7 -#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8 -#define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 */ -/* IEEE 802.11h */ - -/* IEEE 802.11i -#define WLAN_REASON_INVALID_IE 13 -#define WLAN_REASON_MICHAEL_MIC_FAILURE 14 -#define WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT 15 -#define WLAN_REASON_GROUP_KEY_UPDATE_TIMEOUT 16 -#define WLAN_REASON_IE_IN_4WAY_DIFFERS 17 -#define WLAN_REASON_GROUP_CIPHER_NOT_VALID 18 -#define WLAN_REASON_PAIRWISE_CIPHER_NOT_VALID 19 -#define WLAN_REASON_AKMP_NOT_VALID 20 -#define WLAN_REASON_UNSUPPORTED_RSN_IE_VERSION 21 -#define WLAN_REASON_INVALID_RSN_IE_CAPAB 22 -#define WLAN_REASON_IEEE_802_1X_AUTH_FAILED 23 -#define WLAN_REASON_CIPHER_SUITE_REJECTED 24 */ -enum WIFI_STATUS_CODE { _STATS_SUCCESSFUL_ =0 , _STATS_FAILURE_ =1 ,
@@ -155,19 +128,6 @@ enum WIFI_STATUS_CODE { _STATS_RATE_FAIL_ = 18, }; -/* Status codes (IEEE 802.11-2007, 7.3.1.9, Table 7-23) -#define WLAN_STATUS_SUCCESS 0 -#define WLAN_STATUS_UNSPECIFIED_FAILURE 1 -#define WLAN_STATUS_CAPS_UNSUPPORTED 10 -#define WLAN_STATUS_REASSOC_NO_ASSOC 11 -#define WLAN_STATUS_ASSOC_DENIED_UNSPEC 12 -#define WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG 13 -#define WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION 14 -#define WLAN_STATUS_CHALLENGE_FAIL 15 -#define WLAN_STATUS_AUTH_TIMEOUT 16 -#define WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA 17 -#define WLAN_STATUS_ASSOC_DENIED_RATES 18 */ -/* entended */ /* IEEE 802.11b */ #define WLAN_STATUS_ASSOC_DENIED_NOSHORT 19
@@ -552,16 +512,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _IEEE8021X_MGT_ 1/* WPA */ #define _IEEE8021X_PSK_ 2/* WPA with pre-shared key */ -/* -#define _NO_PRIVACY_ 0 -#define _WEP_40_PRIVACY_ 1 -#define _TKIP_PRIVACY_ 2 -#define _WRAP_PRIVACY_ 3 -#define _CCMP_PRIVACY_ 4 -#define _WEP_104_PRIVACY_ 5 -#define _WEP_WPA_MIXED_PRIVACY_ 6 WEP + WPA -*/ -/*----------------------------------------------------------------------------- Below is the definition for WMM ------------------------------------------------------------------------------*/
Signature · 1 line
2.33.0
Re: [PATCH 2/2] staging: r8188eu: remove commented constants from wifi.h
Quoted 84 lines · Michael Straube
Remove commented constants from
wifi.h.Signed-off-by Michael Straube <[email protected]>--- drivers/staging/r8188eu/include/wifi.h | 50 -------------------------- 1 file changed, 50 deletions(-)drivers/staging/r8188eu/include/wifi.h +0
-51@@ -114,33 +114,6 @@ enum WIFI_REASON_CODE { _RSON_TDLS_TEAR_UN_RSN_ = 26, }; -/* Reason codes (IEEE 802.11-2007, 7.3.1.7, Table 7-22) - -#define WLAN_REASON_UNSPECIFIED 1 -#define WLAN_REASON_PREV_AUTH_NOT_VALID 2 -#define WLAN_REASON_DEAUTH_LEAVING 3 -#define WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4 -#define WLAN_REASON_DISASSOC_AP_BUSY 5 -#define WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA 6 -#define WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA 7 -#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8 -#define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 */ -/* IEEE 802.11h */ - -/* IEEE 802.11i -#define WLAN_REASON_INVALID_IE 13 -#define WLAN_REASON_MICHAEL_MIC_FAILURE 14 -#define WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT 15 -#define WLAN_REASON_GROUP_KEY_UPDATE_TIMEOUT 16 -#define WLAN_REASON_IE_IN_4WAY_DIFFERS 17 -#define WLAN_REASON_GROUP_CIPHER_NOT_VALID 18 -#define WLAN_REASON_PAIRWISE_CIPHER_NOT_VALID 19 -#define WLAN_REASON_AKMP_NOT_VALID 20 -#define WLAN_REASON_UNSUPPORTED_RSN_IE_VERSION 21 -#define WLAN_REASON_INVALID_RSN_IE_CAPAB 22 -#define WLAN_REASON_IEEE_802_1X_AUTH_FAILED 23 -#define WLAN_REASON_CIPHER_SUITE_REJECTED 24 */ -enum WIFI_STATUS_CODE { _STATS_SUCCESSFUL_ =0 , _STATS_FAILURE_ =1 ,@@ -155,19 +128,6 @@ enum WIFI_STATUS_CODE { _STATS_RATE_FAIL_ = 18, }; -/* Status codes (IEEE 802.11-2007, 7.3.1.9, Table 7-23) -#define WLAN_STATUS_SUCCESS 0 -#define WLAN_STATUS_UNSPECIFIED_FAILURE 1 -#define WLAN_STATUS_CAPS_UNSUPPORTED 10 -#define WLAN_STATUS_REASSOC_NO_ASSOC 11 -#define WLAN_STATUS_ASSOC_DENIED_UNSPEC 12 -#define WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG 13 -#define WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION 14 -#define WLAN_STATUS_CHALLENGE_FAIL 15 -#define WLAN_STATUS_AUTH_TIMEOUT 16 -#define WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA 17 -#define WLAN_STATUS_ASSOC_DENIED_RATES 18 */ -/* entended */ /* IEEE 802.11b */ #define WLAN_STATUS_ASSOC_DENIED_NOSHORT 19@@ -552,16 +512,6 @@ static inline int IsFrameTypeCtrl(unsigned char *pframe)#define _IEEE8021X_MGT_ 1/* WPA */ #define _IEEE8021X_PSK_ 2/* WPA with pre-shared key */ -/* -#define _NO_PRIVACY_ 0 -#define _WEP_40_PRIVACY_ 1 -#define _TKIP_PRIVACY_ 2 -#define _WRAP_PRIVACY_ 3 -#define _CCMP_PRIVACY_ 4 -#define _WEP_104_PRIVACY_ 5 -#define _WEP_WPA_MIXED_PRIVACY_ 6 WEP + WPA -*/ -/*----------------------------------------------------------------------------- Below is the definition for WMM ------------------------------------------------------------------------------*/ --
Quoted 2 lines
2.33.0
Regards,
Phil
Quoted 24 lines · Michael Straube
The constants
WLAN_REASON_PWR_CAPABILITY_NOT_VALIDandWLAN_REASON_SUPPORTED_CHANNEL_NOT_VALIDdefined inwifi.hare unused, remove them.Signed-off-by Michael Straube <[email protected]>--- drivers/staging/r8188eu/include/wifi.h | 2 -- 1 file changed, 2 deletions(-)drivers/staging/r8188eu/include/wifi.h +0
-3@@ -126,8 +126,6 @@ enum WIFI_REASON_CODE {#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8 #define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 */ /* IEEE 802.11h */ -#define WLAN_REASON_PWR_CAPABILITY_NOT_VALID 10 -#define WLAN_REASON_SUPPORTED_CHANNEL_NOT_VALID 11/* IEEE 802.11i #define WLAN_REASON_INVALID_IE 13 --
Quoted 2 lines
2.33.0
Regards,
Phil
Greg KH
maintainerQuoted 14 lines · Michael Straube
The constants
WLAN_REASON_PWR_CAPABILITY_NOT_VALIDandWLAN_REASON_SUPPORTED_CHANNEL_NOT_VALIDdefined inwifi.hare unused, remove them.Signed-off-by Michael Straube <[email protected]>--- drivers/staging/r8188eu/include/wifi.h | 2 -- 1 file changed, 2 deletions(-)drivers/staging/r8188eu/include/wifi.h +0
-0
drivers/staging/r8188eu/include/wifi.h enum WIFI_REASON_CODE { · line 128
Quoted 3 lines
drivers/staging/r8188eu/include/wifi.h +0
-0@@ -126,8 +126,6 @@ enum WIFI_REASON_CODE {#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8 #define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 */ /* IEEE 802.11h */
This comment can now be deleted, right?
thanks,
greg k-h
Greg KH
maintainerQuoted 10 lines · Greg KH
Quoted 9 lines · Michael Straube
The constants
WLAN_REASON_PWR_CAPABILITY_NOT_VALIDandWLAN_REASON_SUPPORTED_CHANNEL_NOT_VALIDdefined inwifi.hare unused, remove them.Signed-off-by Michael Straube <[email protected]>--- drivers/staging/r8188eu/include/wifi.h | 2 -- 1 file changed, 2 deletions(-)
Quoted 10 lines
drivers/staging/r8188eu/include/wifi.h enum WIFI_REASON_CODE { · line 128
Quoted 8 lines
drivers/staging/r8188eu/include/wifi.h +0
-0@@ -126,8 +126,6 @@ enum WIFI_REASON_CODE {#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8 #define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 */ /* IEEE 802.11h */ This comment can now be deleted, right?
Ah, you do it on the follow-in patch, nevermind...