staging: rtl8188eu: document enum where it is declared

The comment "/* open system */" is repeated verbatim in several places where
dot11AuthAlgrthm_Open is referenced, but not where it is declared.

Move it to be only at its declaration.

This also fixes some "line over 80 characters" checkpatch warnings.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/include/rtw_mlme.h b/drivers/staging/rtl8188eu/include/rtw_mlme.h
index 3f7d1e631ef9636173d8de3270ead75ebb50096c..8c7e8a36aa13a32dd1205107fab08dd9a87b9cf7 100644 (file)
--- a/drivers/staging/rtl8188eu/include/rtw_mlme.h
+++ b/drivers/staging/rtl8188eu/include/rtw_mlme.h
@@ -65,7 +65,7 @@
 #define _FW_UNDER_SURVEY       WIFI_SITE_MONITOR
 
 enum dot11AuthAlgrthmNum {
-       dot11AuthAlgrthm_Open = 0,
+       dot11AuthAlgrthm_Open = 0, /* open system */
        dot11AuthAlgrthm_Shared,
        dot11AuthAlgrthm_8021X,
        dot11AuthAlgrthm_Auto,

diff --git a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
index 96c1c2d4a112c2b741ae63c35aa0d83ae8e6d79f..796c0b0c9c5ad20a80031cf0990f9f3a7a870ff1 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/ioctl_linux.c
@@ -1625,7 +1625,7 @@ static int rtw_wx_set_enc(struct net_device *dev,
                padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled;
                padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_;
                padapter->securitypriv.dot118021XGrpPrivacy = _NO_PRIVACY_;
-               padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Open; /* open system */
+               padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Open;
                authmode = Ndis802_11AuthModeOpen;
                padapter->securitypriv.ndisauthtype = authmode;
 
@@ -1664,7 +1664,7 @@ static int rtw_wx_set_enc(struct net_device *dev,
                DBG_88E("rtw_wx_set_enc():erq->flags = 0x%x\n", erq->flags);
 
                padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;/* Ndis802_11EncryptionDisabled; */
-               padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Open; /* open system */
+               padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Open;
                padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_;
                padapter->securitypriv.dot118021XGrpPrivacy = _NO_PRIVACY_;
                authmode = Ndis802_11AuthModeOpen;
@@ -1855,7 +1855,7 @@ static int rtw_wx_set_auth(struct net_device *dev,
                        padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled;
                        padapter->securitypriv.dot11PrivacyAlgrthm = _NO_PRIVACY_;
                        padapter->securitypriv.dot118021XGrpPrivacy = _NO_PRIVACY_;
-                       padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Open; /* open system */
+                       padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Open;
                        padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen;
                }
 

diff --git a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
index baff1e2661d55b60ac88b5664f705dc87d4de835..64c99f2e9077cd7265c11e31864607a190403047 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
+++ b/drivers/staging/rtl8188eu/os_dep/mlme_linux.c
@@ -82,7 +82,7 @@ void rtw_reset_securitypriv(struct adapter *adapter)
                /* reset values in securitypriv */
                struct security_priv *psec_priv = &adapter->securitypriv;
 
-               psec_priv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;  /* open system */
+               psec_priv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;
                psec_priv->dot11PrivacyAlgrthm = _NO_PRIVACY_;
                psec_priv->dot11PrivacyKeyIndex = 0;
                psec_priv->dot118021XGrpPrivacy = _NO_PRIVACY_;

diff --git a/drivers/staging/rtl8188eu/os_dep/os_intfs.c b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
index c944b149391cb708428452be27910cdcaabd6d97..e5e9235bc093a4f2566978f1029f34f03bac947f 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8188eu/os_dep/os_intfs.c
@@ -800,7 +800,7 @@ static u8 rtw_init_default_value(struct adapter *padapter)
        psecuritypriv->binstallGrpkey = _FAIL;
        psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt;
        psecuritypriv->sw_decrypt = pregistrypriv->software_decrypt;
-       psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; /* open system */
+       psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open;
        psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_;
        psecuritypriv->dot11PrivacyKeyIndex = 0;
        psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_;