staging: rtl8723bs: Fix IEEE80211 authentication algorithm constants.

This driver's local ieee80211 include file defines the constants
AUTH_ALG_* to represent authenication algorithm options.  However,
these constants are defined in 'linux/ieee80211.h' as WLAN_AUTH_*,
and have the correct values.

Signed-off-by: Quytelda Kahja <quytelda@tamalin.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
index 2c7597ad0470dccc4f6e940dab1e5677582c9780..a353dc9b883aef4de629bd176eed02dfcd413342 100644 (file)
--- a/drivers/staging/rtl8723bs/include/ieee80211.h
+++ b/drivers/staging/rtl8723bs/include/ieee80211.h
@@ -84,10 +84,6 @@ enum {
 #define IEEE_PARAM_IEEE_802_1X                         6
 #define IEEE_PARAM_WPAX_SELECT                         7
 
-#define AUTH_ALG_OPEN_SYSTEM                   0x1
-#define AUTH_ALG_SHARED_KEY                    0x2
-#define AUTH_ALG_LEAP                          0x00000004
-
 #define IEEE_MLME_STA_DEAUTH                           1
 #define IEEE_MLME_STA_DISASSOC                 2
 

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index 32dcee9a14519f9cfdca9dc37ab6f59a7e059af4..b26533983864315bc23f25b870f6f6879d49587a 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -476,26 +476,26 @@ static int wpa_set_auth_algs(struct net_device *dev, u32 value)
        struct adapter *padapter = (struct adapter *) rtw_netdev_priv(dev);
        int ret = 0;
 
-       if ((value & AUTH_ALG_SHARED_KEY) && (value & AUTH_ALG_OPEN_SYSTEM)) {
-               DBG_871X("wpa_set_auth_algs, AUTH_ALG_SHARED_KEY and  AUTH_ALG_OPEN_SYSTEM [value:0x%x]\n", value);
+       if ((value & WLAN_AUTH_SHARED_KEY) && (value & WLAN_AUTH_OPEN)) {
+               DBG_871X("wpa_set_auth_algs, WLAN_AUTH_SHARED_KEY and WLAN_AUTH_OPEN [value:0x%x]\n", value);
                padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
                padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeAutoSwitch;
                padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Auto;
-       } else if (value & AUTH_ALG_SHARED_KEY) {
-               DBG_871X("wpa_set_auth_algs, AUTH_ALG_SHARED_KEY  [value:0x%x]\n", value);
+       } else if (value & WLAN_AUTH_SHARED_KEY)        {
+               DBG_871X("wpa_set_auth_algs, WLAN_AUTH_SHARED_KEY  [value:0x%x]\n", value);
                padapter->securitypriv.ndisencryptstatus = Ndis802_11Encryption1Enabled;
 
                padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeShared;
                padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Shared;
-       } else if (value & AUTH_ALG_OPEN_SYSTEM) {
-               DBG_871X("wpa_set_auth_algs, AUTH_ALG_OPEN_SYSTEM\n");
+       } else if (value & WLAN_AUTH_OPEN) {
+               DBG_871X("wpa_set_auth_algs, WLAN_AUTH_OPEN\n");
                /* padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled; */
                if (padapter->securitypriv.ndisauthtype < Ndis802_11AuthModeWPAPSK) {
                        padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen;
                        padapter->securitypriv.dot11AuthAlgrthm = dot11AuthAlgrthm_Open;
                }
-       } else if (value & AUTH_ALG_LEAP) {
-               DBG_871X("wpa_set_auth_algs, AUTH_ALG_LEAP\n");
+       } else if (value & WLAN_AUTH_LEAP) {
+               DBG_871X("wpa_set_auth_algs, WLAN_AUTH_LEAP\n");
        } else {
                DBG_871X("wpa_set_auth_algs, error!\n");
                ret = -EINVAL;