Staging: rtl8723bs: fix names in wlan_bssdef.h

This commit converts names of structs / enums
in include/wlan_bssdef.h from ALL_CAPS format to lowercase

Signed-off-by: Marco Cesati <marcocesati@gmail.com>
Link: https://lore.kernel.org/r/20210317222130.29528-3-marcocesati@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index e671ccf..2aaf25b 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -760,7 +760,7 @@ u8 rtw_joinbss_cmd(struct adapter  *padapter, struct wlan_network *pnetwork)
        struct security_priv *psecuritypriv = &padapter->securitypriv;
        struct registry_priv *pregistrypriv = &padapter->registrypriv;
        struct ht_priv          *phtpriv = &pmlmepriv->htpriv;
-       enum NDIS_802_11_NETWORK_INFRASTRUCTURE ndis_network_mode = pnetwork->network.InfrastructureMode;
+       enum ndis_802_11_network_infrastructure ndis_network_mode = pnetwork->network.InfrastructureMode;
        struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
        struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
        u32 tmp_len;
@@ -914,7 +914,7 @@ exit:
        return res;
 }
 
-u8 rtw_setopmode_cmd(struct adapter  *padapter, enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue)
+u8 rtw_setopmode_cmd(struct adapter  *padapter, enum ndis_802_11_network_infrastructure networktype, bool enqueue)
 {
        struct  cmd_obj *ph2c;
        struct  setopmode_parm *psetop;

diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
index c9418bf..211071e 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
+++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c
@@ -401,11 +401,11 @@ exit:
 }
 
 u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,
-       enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype)
+       enum ndis_802_11_network_infrastructure networktype)
 {
        struct  mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct  wlan_network    *cur_network = &pmlmepriv->cur_network;
-       enum NDIS_802_11_NETWORK_INFRASTRUCTURE *pold_state = &(cur_network->network.InfrastructureMode);
+       enum ndis_802_11_network_infrastructure *pold_state = &(cur_network->network.InfrastructureMode);
 
        RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_notice_,
                 ("+rtw_set_802_11_infrastructure_mode: old =%d new =%d fw_state = 0x%08x\n",
@@ -539,7 +539,7 @@ exit:
        return res;
 }
 
-u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum NDIS_802_11_AUTHENTICATION_MODE authmode)
+u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11_authentication_mode authmode)
 {
        struct security_priv *psecuritypriv = &padapter->securitypriv;
        int res;

diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index a3d431a..4df980f 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -63,7 +63,7 @@ void rtw_hal_dm_deinit(struct adapter *padapter)
 
 static void rtw_hal_init_opmode(struct adapter *padapter)
 {
-       enum NDIS_802_11_NETWORK_INFRASTRUCTURE networkType = Ndis802_11InfrastructureMax;
+       enum ndis_802_11_network_infrastructure networkType = Ndis802_11InfrastructureMax;
        struct  mlme_priv *pmlmepriv = &(padapter->mlmepriv);
        signed int fw_state;
 

diff --git a/drivers/staging/rtl8723bs/include/rtw_cmd.h b/drivers/staging/rtl8723bs/include/rtw_cmd.h
index b15a5ab..dd01c3c 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_cmd.h
+++ b/drivers/staging/rtl8723bs/include/rtw_cmd.h
@@ -826,7 +826,7 @@ extern u8 rtw_clearstakey_cmd(struct adapter *padapter, struct sta_info *sta, u8
 
 extern u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork);
 u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool enqueue);
-extern u8 rtw_setopmode_cmd(struct adapter  *padapter, enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype, bool enqueue);
+extern u8 rtw_setopmode_cmd(struct adapter  *padapter, enum ndis_802_11_network_infrastructure networktype, bool enqueue);
 extern u8 rtw_setdatarate_cmd(struct adapter  *padapter, u8 *rateset);
 extern u8 rtw_setrfintfs_cmd(struct adapter  *padapter, u8 mode);
 

diff --git a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h b/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
index 4db23b1..4b929b8 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
+++ b/drivers/staging/rtl8723bs/include/rtw_ioctl_set.h
@@ -16,12 +16,12 @@ struct BSSIDInfo {
 };
 
 
-u8 rtw_set_802_11_authentication_mode(struct adapter *pdapter, enum NDIS_802_11_AUTHENTICATION_MODE authmode);
+u8 rtw_set_802_11_authentication_mode(struct adapter *pdapter, enum ndis_802_11_authentication_mode authmode);
 u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid);
 u8 rtw_set_802_11_add_wep(struct adapter *padapter, struct ndis_802_11_wep *wep);
 u8 rtw_set_802_11_disassociate(struct adapter *padapter);
 u8 rtw_set_802_11_bssid_list_scan(struct adapter *padapter, struct ndis_802_11_ssid *pssid, int ssid_max_num);
-u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, enum NDIS_802_11_NETWORK_INFRASTRUCTURE networktype);
+u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter, enum ndis_802_11_network_infrastructure networktype);
 u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid);
 u8 rtw_set_802_11_connect(struct adapter *padapter, u8 *bssid, struct ndis_802_11_ssid *ssid);
 

diff --git a/drivers/staging/rtl8723bs/include/rtw_security.h b/drivers/staging/rtl8723bs/include/rtw_security.h
index 3f3fd19..8611dff 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_security.h
+++ b/drivers/staging/rtl8723bs/include/rtw_security.h
@@ -142,7 +142,7 @@ struct security_priv {
 
 
        /* keeps the auth_type & enc_status from upper layer ioctl(wpa_supplicant or wzc) */
-       u32 ndisauthtype;       /*  enum NDIS_802_11_AUTHENTICATION_MODE */
+       u32 ndisauthtype;       /*  enum ndis_802_11_authentication_mode */
        u32 ndisencryptstatus;  /*  NDIS_802_11_ENCRYPTION_STATUS */
 
        struct wlan_bssid_ex sec_bss;  /* for joinbss (h2c buffer) usage */

diff --git a/drivers/staging/rtl8723bs/include/wlan_bssdef.h b/drivers/staging/rtl8723bs/include/wlan_bssdef.h
index b9bc8ba..2598353 100644 (file)
--- a/drivers/staging/rtl8723bs/include/wlan_bssdef.h
+++ b/drivers/staging/rtl8723bs/include/wlan_bssdef.h
@@ -24,7 +24,7 @@ struct ndis_802_11_ssid {
        u8  Ssid[32];
 };
 
-enum NDIS_802_11_NETWORK_TYPE {
+enum ndis_802_11_network_type {
        Ndis802_11FH,
        Ndis802_11DS,
        Ndis802_11OFDM5,
@@ -51,7 +51,7 @@ struct ndis_802_11_conf {
        struct ndis_802_11_conf_fh    FHConfig;
 };
 
-enum NDIS_802_11_NETWORK_INFRASTRUCTURE {
+enum ndis_802_11_network_infrastructure {
        Ndis802_11IBSS,
        Ndis802_11Infrastructure,
        Ndis802_11AutoUnknown,
@@ -74,13 +74,13 @@ struct ndis_80211_var_ie {
 /* Length is the 4 bytes multiples of the sum of
  * sizeof (NDIS_802_11_MAC_ADDRESS) + 2 +
  * sizeof (struct ndis_802_11_ssid) + sizeof (u32) +
- * sizeof (long) + sizeof (enum NDIS_802_11_NETWORK_TYPE) +
+ * sizeof (long) + sizeof (enum ndis_802_11_network_type) +
  * sizeof (struct ndis_802_11_conf) + sizeof (NDIS_802_11_RATES_EX) + IELength
  *
  * Except for IELength, all other fields are fixed length. Therefore, we can
  * define a macro to present the partial sum.
  */
-enum NDIS_802_11_AUTHENTICATION_MODE {
+enum ndis_802_11_authentication_mode {
        Ndis802_11AuthModeOpen,
        Ndis802_11AuthModeShared,
        Ndis802_11AuthModeAutoSwitch,
@@ -91,7 +91,7 @@ enum NDIS_802_11_AUTHENTICATION_MODE {
        Ndis802_11AuthModeMax   /*  Not a real mode, defined as upper bound */
 };
 
-enum NDIS_802_11_WEP_STATUS {
+enum ndis_802_11_wep_status {
        Ndis802_11WEPEnabled,
        Ndis802_11Encryption1Enabled = Ndis802_11WEPEnabled,
        Ndis802_11WEPDisabled,
@@ -127,7 +127,7 @@ struct ndis_801_11_ai_resfi {
        u16 AssociationId;
 };
 
-struct NDIS_802_11_ASSOCIATION_INFORMATION {
+struct ndis_802_11_association_information {
        u32                   Length;
        u16                  AvailableRequestFixedIEs;
        struct ndis_802_11_ai_reqfi    RequestFixedIEs;
@@ -139,13 +139,13 @@ struct NDIS_802_11_ASSOCIATION_INFORMATION {
        u32                   OffsetResponseIEs;
 };
 
-enum NDIS_802_11_RELOAD_DEFAULTS {
+enum ndis_802_11_reload_defaults {
        Ndis802_11ReloadWEPKeys
 };
 
 
 /*  Key mapping keys require a BSSID */
-struct NDIS_802_11_KEY {
+struct ndis_802_11_key {
        u32           Length;             /*  Length of this structure */
        u32           KeyIndex;
        u32           KeyLength;          /*  length of key in bytes */
@@ -154,7 +154,7 @@ struct NDIS_802_11_KEY {
        u8           KeyMaterial[32];     /*  variable length depending on above field */
 };
 
-struct NDIS_802_11_REMOVE_KEY {
+struct ndis_802_11_remove_key {
        u32                   Length;        /*  Length of this structure */
        u32                   KeyIndex;
        NDIS_802_11_MAC_ADDRESS BSSID;
@@ -211,9 +211,9 @@ struct wlan_bssid_ex {
        struct ndis_802_11_ssid  Ssid;
        u32  Privacy;
        long  Rssi;/* in dBM, raw data , get from PHY) */
-       enum NDIS_802_11_NETWORK_TYPE  NetworkTypeInUse;
+       enum ndis_802_11_network_type  NetworkTypeInUse;
        struct ndis_802_11_conf  Configuration;
-       enum NDIS_802_11_NETWORK_INFRASTRUCTURE  InfrastructureMode;
+       enum ndis_802_11_network_infrastructure  InfrastructureMode;
        NDIS_802_11_RATES_EX  SupportedRates;
        struct wlan_phy_info PhyInfo;
        u32  IELength;
@@ -236,13 +236,13 @@ struct    wlan_network {
        struct wlan_bcn_info    BcnInfo;
 };
 
-enum VRTL_CARRIER_SENSE {
+enum vrtl_carrier_sense {
        DISABLE_VCS,
        ENABLE_VCS,
        AUTO_VCS
 };
 
-enum VCS_TYPE {
+enum vcs_type {
        NONE_VCS,
        RTS_CTS,
        CTS_TO_SELF
@@ -254,7 +254,7 @@ enum VCS_TYPE {
 #define PWR_UAPSD 3
 #define PWR_VOIP 4
 
-enum UAPSD_MAX_SP {
+enum uapsd_max_sp {
        NO_LIMIT,
        TWO_MSDU,
        FOUR_MSDU,

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
index 2ff71d0..685ecb4 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c
@@ -1274,7 +1274,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
                                     struct vif_params *params)
 {
        enum nl80211_iftype old_type;
-       enum NDIS_802_11_NETWORK_INFRASTRUCTURE networkType;
+       enum ndis_802_11_network_infrastructure networkType;
        struct adapter *padapter = rtw_netdev_priv(ndev);
        struct wireless_dev *rtw_wdev = padapter->rtw_wdev;
        struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
@@ -2017,7 +2017,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
                                 struct cfg80211_connect_params *sme)
 {
        int ret = 0;
-       enum NDIS_802_11_AUTHENTICATION_MODE authmode;
+       enum ndis_802_11_authentication_mode authmode;
        struct ndis_802_11_ssid ndis_ssid;
        struct adapter *padapter = rtw_netdev_priv(ndev);
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
index aac1391..2d8da96 100644 (file)
--- a/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
@@ -817,7 +817,7 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
                             union iwreq_data *wrqu, char *b)
 {
        struct adapter *padapter = rtw_netdev_priv(dev);
-       enum NDIS_802_11_NETWORK_INFRASTRUCTURE networkType;
+       enum ndis_802_11_network_infrastructure networkType;
        int ret = 0;
 
        if (_FAIL == rtw_pwr_wakeup(padapter)) {
@@ -1103,7 +1103,7 @@ static int rtw_wx_set_wap(struct net_device *dev,
        u8 *dst_bssid, *src_bssid;
        struct __queue  *queue  = &(pmlmepriv->scanned_queue);
        struct  wlan_network    *pnetwork = NULL;
-       enum NDIS_802_11_AUTHENTICATION_MODE    authmode;
+       enum ndis_802_11_authentication_mode    authmode;
 
        rtw_ps_deny(padapter, PS_DENY_JOIN);
        if (_FAIL == rtw_pwr_wakeup(padapter)) {
@@ -1469,7 +1469,7 @@ static int rtw_wx_set_essid(struct net_device *dev,
        struct __queue *queue = &pmlmepriv->scanned_queue;
        struct list_head *phead;
        struct wlan_network *pnetwork = NULL;
-       enum NDIS_802_11_AUTHENTICATION_MODE authmode;
+       enum ndis_802_11_authentication_mode authmode;
        struct ndis_802_11_ssid ndis_ssid;
        u8 *dst_ssid, *src_ssid;
 
@@ -1807,7 +1807,7 @@ static int rtw_wx_set_enc(struct net_device *dev,
        u32 key, ret = 0;
        u32 keyindex_provided;
        struct ndis_802_11_wep   wep;
-       enum NDIS_802_11_AUTHENTICATION_MODE authmode;
+       enum ndis_802_11_authentication_mode authmode;
 
        struct iw_point *erq = &(wrqu->encoding);
        struct adapter *padapter = rtw_netdev_priv(dev);