* [PATCH 2/2] staging: r8188eu: remove commented constants from wifi.h
2021-08-29 18:07 [PATCH 1/2] staging: r8188eu: remove unused constants from wifi.h Michael Straube
@ 2021-08-29 18:07 ` Michael Straube
2021-08-30 0:21 ` Phillip Potter
2021-08-30 0:19 ` [PATCH 1/2] staging: r8188eu: remove unused " Phillip Potter
2021-09-02 9:23 ` Greg KH
2 siblings, 1 reply; 6+ messages in thread
From: Michael Straube @ 2021-08-29 18:07 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, phil, martin, fmdefrancesco, linux-staging,
linux-kernel, Michael Straube
Remove commented constants from wifi.h.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/wifi.h | 50 --------------------------
1 file changed, 50 deletions(-)
diff --git a/drivers/staging/r8188eu/include/wifi.h b/drivers/staging/r8188eu/include/wifi.h
index eb07ac9b8943..193a557f0f47 100644
--- a/drivers/staging/r8188eu/include/wifi.h
+++ b/drivers/staging/r8188eu/include/wifi.h
@@ -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
------------------------------------------------------------------------------*/
--
2.33.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] staging: r8188eu: remove commented constants from wifi.h
2021-08-29 18:07 ` [PATCH 2/2] staging: r8188eu: remove commented " Michael Straube
@ 2021-08-30 0:21 ` Phillip Potter
0 siblings, 0 replies; 6+ messages in thread
From: Phillip Potter @ 2021-08-30 0:21 UTC (permalink / raw)
To: Michael Straube
Cc: Greg KH, Larry Finger, Martin Kaiser, Fabio M. De Francesco,
open list:STAGING SUBSYSTEM, Linux Kernel Mailing List
On Sun, 29 Aug 2021 at 19:07, Michael Straube <straube.linux@gmail.com> wrote:
>
> Remove commented constants from wifi.h.
>
> Signed-off-by: Michael Straube <straube.linux@gmail.com>
> ---
> drivers/staging/r8188eu/include/wifi.h | 50 --------------------------
> 1 file changed, 50 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/include/wifi.h b/drivers/staging/r8188eu/include/wifi.h
> index eb07ac9b8943..193a557f0f47 100644
> --- a/drivers/staging/r8188eu/include/wifi.h
> +++ b/drivers/staging/r8188eu/include/wifi.h
> @@ -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
> ------------------------------------------------------------------------------*/
> --
> 2.33.0
>
Acked-by: Phillip Potter <phil@philpotter.co.uk>
Regards,
Phil
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] staging: r8188eu: remove unused constants from wifi.h
2021-08-29 18:07 [PATCH 1/2] staging: r8188eu: remove unused constants from wifi.h Michael Straube
2021-08-29 18:07 ` [PATCH 2/2] staging: r8188eu: remove commented " Michael Straube
@ 2021-08-30 0:19 ` Phillip Potter
2021-09-02 9:23 ` Greg KH
2 siblings, 0 replies; 6+ messages in thread
From: Phillip Potter @ 2021-08-30 0:19 UTC (permalink / raw)
To: Michael Straube
Cc: Greg KH, Larry Finger, Martin Kaiser, Fabio M. De Francesco,
open list:STAGING SUBSYSTEM, Linux Kernel Mailing List
On Sun, 29 Aug 2021 at 19:07, Michael Straube <straube.linux@gmail.com> wrote:
>
> The constants WLAN_REASON_PWR_CAPABILITY_NOT_VALID and
> WLAN_REASON_SUPPORTED_CHANNEL_NOT_VALID defined in wifi.h
> are unused, remove them.
>
> Signed-off-by: Michael Straube <straube.linux@gmail.com>
> ---
> drivers/staging/r8188eu/include/wifi.h | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/include/wifi.h b/drivers/staging/r8188eu/include/wifi.h
> index 0b3fd94cea18..eb07ac9b8943 100644
> --- a/drivers/staging/r8188eu/include/wifi.h
> +++ b/drivers/staging/r8188eu/include/wifi.h
> @@ -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
> --
> 2.33.0
>
Acked-by: Phillip Potter <phil@philpotter.co.uk>
Regards,
Phil
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] staging: r8188eu: remove unused constants from wifi.h
2021-08-29 18:07 [PATCH 1/2] staging: r8188eu: remove unused constants from wifi.h Michael Straube
2021-08-29 18:07 ` [PATCH 2/2] staging: r8188eu: remove commented " Michael Straube
2021-08-30 0:19 ` [PATCH 1/2] staging: r8188eu: remove unused " Phillip Potter
@ 2021-09-02 9:23 ` Greg KH
2021-09-02 9:23 ` Greg KH
2 siblings, 1 reply; 6+ messages in thread
From: Greg KH @ 2021-09-02 9:23 UTC (permalink / raw)
To: Michael Straube
Cc: Larry.Finger, phil, martin, fmdefrancesco, linux-staging, linux-kernel
On Sun, Aug 29, 2021 at 08:07:16PM +0200, Michael Straube wrote:
> The constants WLAN_REASON_PWR_CAPABILITY_NOT_VALID and
> WLAN_REASON_SUPPORTED_CHANNEL_NOT_VALID defined in wifi.h
> are unused, remove them.
>
> Signed-off-by: Michael Straube <straube.linux@gmail.com>
> ---
> drivers/staging/r8188eu/include/wifi.h | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/include/wifi.h b/drivers/staging/r8188eu/include/wifi.h
> index 0b3fd94cea18..eb07ac9b8943 100644
> --- a/drivers/staging/r8188eu/include/wifi.h
> +++ b/drivers/staging/r8188eu/include/wifi.h
> @@ -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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/2] staging: r8188eu: remove unused constants from wifi.h
2021-09-02 9:23 ` Greg KH
@ 2021-09-02 9:23 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2021-09-02 9:23 UTC (permalink / raw)
To: Michael Straube
Cc: Larry.Finger, phil, martin, fmdefrancesco, linux-staging, linux-kernel
On Thu, Sep 02, 2021 at 11:23:34AM +0200, Greg KH wrote:
> On Sun, Aug 29, 2021 at 08:07:16PM +0200, Michael Straube wrote:
> > The constants WLAN_REASON_PWR_CAPABILITY_NOT_VALID and
> > WLAN_REASON_SUPPORTED_CHANNEL_NOT_VALID defined in wifi.h
> > are unused, remove them.
> >
> > Signed-off-by: Michael Straube <straube.linux@gmail.com>
> > ---
> > drivers/staging/r8188eu/include/wifi.h | 2 --
> > 1 file changed, 2 deletions(-)
> >
> > diff --git a/drivers/staging/r8188eu/include/wifi.h b/drivers/staging/r8188eu/include/wifi.h
> > index 0b3fd94cea18..eb07ac9b8943 100644
> > --- a/drivers/staging/r8188eu/include/wifi.h
> > +++ b/drivers/staging/r8188eu/include/wifi.h
> > @@ -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...
^ permalink raw reply [flat|nested] 6+ messages in thread