staging: rtl8723bs: rename ndis_802_11_network_infrastructure enum values to uppercase
PATCH 1/1 staging: rtl8723bs: rename ndis_802_11_network_infrastructure enum values to uppercase
Rename CamelCase enum values in enum ndis_802_11_network_infrastructure to uppercase to comply with kernel coding style as reported by checkpatch.pl.
Compile-tested only.
Signed-off-by Cong Nguyen <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 4 ++-- drivers/staging/rtl8723bs/core/rtw_cmd.c | 10 +++++----- drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 18 +++++++++--------- drivers/staging/rtl8723bs/core/rtw_mlme.c | 8 ++++---- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 14 +++++++------- drivers/staging/rtl8723bs/hal/hal_intf.c | 8 ++++---- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 6 +++--- .../staging/rtl8723bs/include/wlan_bssdef.h | 14 +++++++------- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 10 +++++----- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- 10 files changed, 47 insertions(+), 47 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +2 -2
@@ -826,7 +826,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)memcpy (ie, pbuf, pbss_network->ie_length); -if (pbss_network->infrastructure_mode != Ndis802_11APMode) +if (pbss_network->infrastructure_mode !=NDIS_802_11_AP_MODE )return _FAIL; pbss_network->rssi =0 ;
@@ -1954,7 +1954,7 @@ void rtw_ap_restore_network(struct adapter *padapter)char chk_alive_list[NUM_STA ];int i; -rtw_setopmode_cmd (padapter, Ndis802_11APMode, false); +rtw_setopmode_cmd (padapter,NDIS_802_11_AP_MODE , false); set_channel_bwmode(padapter, pmlmeext->cur_channel,
drivers/staging/rtl8723bs/core/rtw_cmd.c +5 -5
@@ -698,17 +698,17 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork)/* for hidden ap to set fw_state here */ if (check_fwstate (pmlmepriv,WIFI_STATION_STATE |WIFI_ADHOC_STATE ) != true) {switch (ndis_network_mode) { -case Ndis802_11IBSS: +case NDIS_802_11_IBSS :set_fwstate (pmlmepriv,WIFI_ADHOC_STATE );break ; -case Ndis802_11Infrastructure: +case NDIS_802_11_INFRASTRUCTURE :set_fwstate (pmlmepriv,WIFI_STATION_STATE );break ; -case Ndis802_11APMode: -case Ndis802_11AutoUnknown: -case Ndis802_11InfrastructureMax: +case NDIS_802_11_AP_MODE : +case NDIS_802_11_AUTO_UNKNOWN : +case NDIS_802_11_INFRASTRUCTURE_MAX :break ; } }
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +9 -9
@@ -287,8 +287,8 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,enum ndis_802_11_network_infrastructure *pold_state = &(cur_network->network.infrastructure_mode);if (*pold_state != networktype) { -if (*pold_state == Ndis802_11APMode) { -/* change to other mode from Ndis802_11APMode */ +if (*pold_state ==NDIS_802_11_AP_MODE ) { +/* change to other mode from AP mode */ cur_network->join_res =-1 ;stop_ap_mode (padapter);
@@ -296,14 +296,14 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,spin_lock_bh (&pmlmepriv->lock); -if ((check_fwstate (pmlmepriv, _FW_LINKED) == true) || (*pold_state == Ndis802_11IBSS)) +if ((check_fwstate (pmlmepriv, _FW_LINKED) == true) || (*pold_state ==NDIS_802_11_IBSS ))rtw_disassoc_cmd (padapter,0 , true);if ((check_fwstate (pmlmepriv, _FW_LINKED) == true) || (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true))rtw_free_assoc_resources (padapter,1 ); -if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) { +if ((*pold_state ==NDIS_802_11_INFRASTRUCTURE ) || (*pold_state ==NDIS_802_11_IBSS )) {if (check_fwstate (pmlmepriv, _FW_LINKED) == true)rtw_indicate_disconnect (padapter);/* will clr Linked_state; before this function, we must have checked whether issue dis-assoc_cmd or not */ }
@@ -313,23 +313,23 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,_clr_fwstate_ (pmlmepriv, ~WIFI_NULL_STATE );switch (networktype) { -case Ndis802_11IBSS: +case NDIS_802_11_IBSS :set_fwstate (pmlmepriv,WIFI_ADHOC_STATE );break ; -case Ndis802_11Infrastructure: +case NDIS_802_11_INFRASTRUCTURE :set_fwstate (pmlmepriv,WIFI_STATION_STATE );break ; -case Ndis802_11APMode: +case NDIS_802_11_AP_MODE :set_fwstate (pmlmepriv,WIFI_AP_STATE );start_ap_mode (padapter);/* rtw_indicate_connect(padapter); */ break ; -case Ndis802_11AutoUnknown: -case Ndis802_11InfrastructureMax: +case NDIS_802_11_AUTO_UNKNOWN : +case NDIS_802_11_INFRASTRUCTURE_MAX :break ; }
drivers/staging/rtl8723bs/core/rtw_mlme.c +4 -4
@@ -51,7 +51,7 @@ int rtw_init_mlme_priv(struct adapter *padapter) pmlmepriv->pscanned =NULL ; pmlmepriv->fw_state =WIFI_STATION_STATE ;/* Must sync with rtw_wdev_alloc() */ - pmlmepriv->cur_network.network.infrastructure_mode = Ndis802_11AutoUnknown; + pmlmepriv->cur_network.network.infrastructure_mode =NDIS_802_11_AUTO_UNKNOWN ; pmlmepriv->scan_mode =SCAN_ACTIVE ;/* 1: active, 0: passive. Maybe someday we should rename this varable to "active_mode" (Jeff) */ spin_lock_init (&pmlmepriv->lock);
@@ -1056,7 +1056,7 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net/* update fw_state will clr _FW_UNDER_LINKING here indirectly */ switch (pnetwork->network.infrastructure_mode) { -case Ndis802_11Infrastructure: +case NDIS_802_11_INFRASTRUCTURE :if (pmlmepriv->fw_state &WIFI_UNDER_WPS ) pmlmepriv->fw_state =WIFI_STATION_STATE |WIFI_UNDER_WPS ;
@@ -1064,7 +1064,7 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net pmlmepriv->fw_state =WIFI_STATION_STATE ;break ; -case Ndis802_11IBSS: +case NDIS_802_11_IBSS : pmlmepriv->fw_state =WIFI_ADHOC_STATE ;break ;default :
@@ -2145,7 +2145,7 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter) pdev_network->configuration.ds_config = (pregistrypriv->channel); -if (cur_network->network.infrastructure_mode == Ndis802_11IBSS) +if (cur_network->network.infrastructure_mode ==NDIS_802_11_IBSS ) pdev_network->configuration.atim_window = (0 ); pdev_network->infrastructure_mode = (cur_network->network.infrastructure_mode);
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +7 -7
@@ -4003,10 +4003,10 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str val16 =rtw_get_capability ((struct wlan_bssid_ex *)bssid);if (val16 &BIT (0 )) { - bssid->infrastructure_mode = Ndis802_11Infrastructure; + bssid->infrastructure_mode =NDIS_802_11_INFRASTRUCTURE ;memcpy (bssid->mac_address,GetAddr2Ptr (pframe),ETH_ALEN ); }else { - bssid->infrastructure_mode = Ndis802_11IBSS; + bssid->infrastructure_mode =NDIS_802_11_IBSS ;memcpy (bssid->mac_address,GetAddr3Ptr (pframe),ETH_ALEN ); }
@@ -5171,15 +5171,15 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf)struct mlme_ext_info *pmlmeinfo = &pmlmeext->mlmext_info;struct setopmode_parm *psetop = (struct setopmode_parm *)pbuf; -if (psetop->mode == Ndis802_11APMode) { +if (psetop->mode ==NDIS_802_11_AP_MODE ) { pmlmeinfo->state =WIFI_FW_AP_STATE ; type = _HW_STATE_AP_;/* start_ap_mode(padapter); */ - }else if (psetop->mode == Ndis802_11Infrastructure) { + }else if (psetop->mode ==NDIS_802_11_INFRASTRUCTURE ) { pmlmeinfo->state &= ~(BIT (0 ) |BIT (1 ));/* clear state */ pmlmeinfo->state |=WIFI_FW_STATION_STATE ;/* set to STATION_STATE */ type = _HW_STATE_STATION_; - }else if (psetop->mode == Ndis802_11IBSS) { + }else if (psetop->mode ==NDIS_802_11_IBSS ) { type = _HW_STATE_ADHOC_; }else { type = _HW_STATE_NOLINK_;
@@ -5188,7 +5188,7 @@ u8 setopmode_hdl(struct adapter *padapter, u8 *pbuf)rtw_hal_set_hwreg (padapter,HW_VAR_SET_OPMODE , (u8 *)(&type));/* set_msr(padapter, type); */ -if (psetop->mode == Ndis802_11APMode) { +if (psetop->mode ==NDIS_802_11_AP_MODE ) {/* Do this after port switch to */ /* prevent from downloading rsvd page to wrong port */ rtw_btcoex_MediaStatusNotify (padapter,1 );/* connect */
@@ -5211,7 +5211,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf) }/* below is for ad-hoc master */ -if (pparm->network.infrastructure_mode == Ndis802_11IBSS) { +if (pparm->network.infrastructure_mode ==NDIS_802_11_IBSS ) {rtw_joinbss_reset (padapter); pmlmeext->cur_bwmode =CHANNEL_WIDTH_20 ;
drivers/staging/rtl8723bs/hal/hal_intf.c +4 -4
@@ -40,18 +40,18 @@ void rtw_hal_dm_init(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 =NDIS_802_11_INFRASTRUCTURE_MAX ;struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);signed int fw_state; fw_state =get_fwstate (pmlmepriv);if (fw_state &WIFI_ADHOC_STATE ) - networkType = Ndis802_11IBSS; + networkType =NDIS_802_11_IBSS ;else if (fw_state &WIFI_STATION_STATE ) - networkType = Ndis802_11Infrastructure; + networkType =NDIS_802_11_INFRASTRUCTURE ;else if (fw_state &WIFI_AP_STATE ) - networkType = Ndis802_11APMode; + networkType =NDIS_802_11_AP_MODE ;else return ;
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +3 -3
@@ -245,19 +245,19 @@ static void ConstructNullFunctionData(SetPwrMgt (fctrl);switch (cur_network->network.infrastructure_mode) { -case Ndis802_11Infrastructure: +case NDIS_802_11_INFRASTRUCTURE :SetToDs (fctrl);ether_addr_copy (pwlanhdr->addr1,get_my_bssid (&(pmlmeinfo->network)));ether_addr_copy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)));ether_addr_copy (pwlanhdr->addr3, StaAddr);break ; -case Ndis802_11APMode: +case NDIS_802_11_AP_MODE :SetFrDs (fctrl);ether_addr_copy (pwlanhdr->addr1, StaAddr);ether_addr_copy (pwlanhdr->addr2,get_my_bssid (&(pmlmeinfo->network)));ether_addr_copy (pwlanhdr->addr3,myid (&(padapter->eeprompriv)));break ; -case Ndis802_11IBSS: +case NDIS_802_11_IBSS :default :ether_addr_copy (pwlanhdr->addr1, StaAddr);ether_addr_copy (pwlanhdr->addr2,myid (&(padapter->eeprompriv)));
drivers/staging/rtl8723bs/include/wlan_bssdef.h +7 -7
@@ -43,11 +43,11 @@ struct ndis_802_11_conf { };enum ndis_802_11_network_infrastructure { - Ndis802_11IBSS, - Ndis802_11Infrastructure, - Ndis802_11AutoUnknown, - Ndis802_11InfrastructureMax,/* Not a real value, defined as upper bound */ - Ndis802_11APMode, +NDIS_802_11_IBSS , +NDIS_802_11_INFRASTRUCTURE , +NDIS_802_11_AUTO_UNKNOWN , +NDIS_802_11_INFRASTRUCTURE_MAX ,/* Not a real value, defined as upper bound */ +NDIS_802_11_AP_MODE , };struct ndis_802_11_fix_ie {
@@ -125,8 +125,8 @@ struct ndis_802_11_wep {/* MIC check time, 60 seconds. */ #define MIC_CHECK_TIME 60000000 -#ifndef Ndis802_11APMode -#define Ndis802_11APMode (Ndis802_11InfrastructureMax + 1) +#ifndef NDIS_802_11_AP_MODE +#define NDIS_802_11_AP_MODE (NDIS_802_11_INFRASTRUCTURE_MAX + 1)#endif struct wlan_phy_info {
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +5 -5
@@ -1059,13 +1059,13 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,switch (type) {case NL80211_IFTYPE_ADHOC : - networkType = Ndis802_11IBSS; + networkType =NDIS_802_11_IBSS ;break ;case NL80211_IFTYPE_STATION : - networkType = Ndis802_11Infrastructure; + networkType =NDIS_802_11_INFRASTRUCTURE ;break ;case NL80211_IFTYPE_AP : - networkType = Ndis802_11APMode; + networkType =NDIS_802_11_AP_MODE ;break ;default : ret = -EOPNOTSUPP ;
@@ -1610,12 +1610,12 @@ static int cfg80211_rtw_leave_ibss(struct wiphy *wiphy, struct net_device *ndev) rtw_wdev->iftype =NL80211_IFTYPE_STATION ; -if (rtw_set_802_11_infrastructure_mode (padapter, Ndis802_11Infrastructure) == false) { +if (rtw_set_802_11_infrastructure_mode (padapter,NDIS_802_11_INFRASTRUCTURE ) == false) { rtw_wdev->iftype = old_type; ret = -EPERM ; goto leave_ibss; } -rtw_setopmode_cmd (padapter, Ndis802_11Infrastructure, true); +rtw_setopmode_cmd (padapter,NDIS_802_11_INFRASTRUCTURE , true); } leave_ibss:
drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -1
@@ -19,7 +19,7 @@ static int rtw_rfintfs = HWPI;static int rtw_lbkmode;/* RTL8712_AIR_TRX; */ -static int rtw_network_mode = Ndis802_11IBSS;/* Ndis802_11Infrastructure;infra, ad-hoc, auto */ +static int rtw_network_mode =NDIS_802_11_IBSS ;/* NDIS_802_11_INFRASTRUCTURE;infra, ad-hoc, auto */ /* struct ndis_802_11_ssid ssid; */ static int rtw_channel =1 ;/* ad-hoc support requirement */ static int rtw_wireless_mode =WIRELESS_11BG_24N ;
Signature · 1 line
2.25.1
Greg KH
maintainerQuoted 7 lines · Cong Nguyen
drivers/staging/rtl8723bs/include/wlan_bssdef.h +0
-1@@ -43,11 +43,11 @@ struct ndis_802_11_conf { };enum ndis_802_11_network_infrastructure { - Ndis802_11IBSS,
drivers/staging/rtl8723bs/include/wlan_bssdef.h struct ndis_802_11_conf { · line 51
Quoted 10 lines
drivers/staging/rtl8723bs/include/wlan_bssdef.h +5
-4- Ndis802_11Infrastructure, - Ndis802_11AutoUnknown, - Ndis802_11InfrastructureMax,/* Not a real value, defined as upper bound */ - Ndis802_11APMode, +NDIS_802_11_IBSS , +NDIS_802_11_INFRASTRUCTURE , +NDIS_802_11_AUTO_UNKNOWN , +NDIS_802_11_INFRASTRUCTURE_MAX ,/* Not a real value, defined as upper bound */ + NDIS_802_11_AP_MODE, };
Why aren't you just using the NDIS values that the kernel already provides for these? Don't re-invent the wheel.
thanks,
greg k-h
You're right, the kernel already provides the enum nl80211_iftype. I've reworked the patch to use it directly and drop the translation layer.
v2: https://lore.kernel.org/linux-staging/[email protected]/
Quoted 26 lines · Greg KH
Quoted 7 lines · Cong Nguyen
drivers/staging/rtl8723bs/include/wlan_bssdef.h +0
-1@@ -43,11 +43,11 @@ struct ndis_802_11_conf { };enum ndis_802_11_network_infrastructure { - Ndis802_11IBSS,drivers/staging/rtl8723bs/include/wlan_bssdef.h struct ndis_802_11_conf { · line 51
Quoted 10 lines
drivers/staging/rtl8723bs/include/wlan_bssdef.h +5
-4- Ndis802_11Infrastructure, - Ndis802_11AutoUnknown, - Ndis802_11InfrastructureMax,/* Not a real value, defined as upper bound */ - Ndis802_11APMode, +NDIS_802_11_IBSS , +NDIS_802_11_INFRASTRUCTURE , +NDIS_802_11_AUTO_UNKNOWN , +NDIS_802_11_INFRASTRUCTURE_MAX ,/* Not a real value, defined as upper bound */ + NDIS_802_11_AP_MODE, };Why aren't you just using the NDIS values that the kernel already provides for these? Don't re-invent the wheel.
thanks,
greg k-h