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 3f7d1e6..8c7e8a3 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 96c1c2d..796c0b0 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 --cc drivers/staging/rtl8188eu/os_dep/mlme_linux.c
Simple merge

diff --cc drivers/staging/rtl8188eu/os_dep/os_intfs.c
Simple merge