* [PATCH 1/4] staging: rtl8723bs: change struct member bDriverStopped
2026-07-15 17:16 [PATCH 0/4] staging: rtl8723bs: Changing two struct members Dalvin-Ehinoma Noah Aiguobas
@ 2026-07-15 17:16 ` Dalvin-Ehinoma Noah Aiguobas
2026-07-15 17:16 ` [PATCH 2/4] staging: rtl8723bs: wrap line over 100 characters Dalvin-Ehinoma Noah Aiguobas
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Dalvin-Ehinoma Noah Aiguobas @ 2026-07-15 17:16 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, Dalvin-Ehinoma Noah Aiguobas
Member name does not adhere to linux coding style.
Changed type as well since b indicates a boolean type and in every
instance of setting the variable the values true and false are used.
bDriverStopped -> driver_stopped
Signed-off-by: Dalvin-Ehinoma Noah Aiguobas <fliegbert2@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_cmd.c | 8 +++----
drivers/staging/rtl8723bs/core/rtw_mlme.c | 8 +++----
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 22 +++++++++----------
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 ++--
drivers/staging/rtl8723bs/core/rtw_recv.c | 10 ++++-----
drivers/staging/rtl8723bs/hal/odm.c | 2 +-
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 10 ++++-----
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 6 ++---
.../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 4 ++--
.../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 8 +++----
drivers/staging/rtl8723bs/hal/sdio_ops.c | 2 +-
drivers/staging/rtl8723bs/include/drv_types.h | 6 ++---
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 8 +++----
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 4 ++--
14 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index d8ad1c75195b..df6b118ee9c9 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -396,10 +396,10 @@ int rtw_cmd_thread(void *context)
break;
}
- if (padapter->bDriverStopped || padapter->bSurpriseRemoved) {
+ if (padapter->driver_stopped || padapter->bSurpriseRemoved) {
netdev_dbg(padapter->pnetdev,
"%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
- __func__, padapter->bDriverStopped,
+ __func__, padapter->driver_stopped,
padapter->bSurpriseRemoved, __LINE__);
break;
}
@@ -419,10 +419,10 @@ int rtw_cmd_thread(void *context)
continue;
_next:
- if (padapter->bDriverStopped || padapter->bSurpriseRemoved) {
+ if (padapter->driver_stopped || padapter->bSurpriseRemoved) {
netdev_dbg(padapter->pnetdev,
"%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
- __func__, padapter->bDriverStopped,
+ __func__, padapter->driver_stopped,
padapter->bSurpriseRemoved, __LINE__);
break;
}
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index aaac09100fe3..2606fc6b8c5c 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -264,7 +264,7 @@ void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)
bool rtw_if_up(struct adapter *padapter)
{
- if (padapter->bDriverStopped || padapter->bSurpriseRemoved ||
+ if (padapter->driver_stopped || padapter->bSurpriseRemoved ||
!check_fwstate(&padapter->mlmepriv, _FW_LINKED))
return false;
@@ -930,7 +930,7 @@ void rtw_scan_abort(struct adapter *adapter)
pmlmeext->scan_abort = true;
while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)
&& jiffies_to_msecs(start) <= 200) {
- if (adapter->bDriverStopped || adapter->bSurpriseRemoved)
+ if (adapter->driver_stopped || adapter->bSurpriseRemoved)
break;
msleep(20);
@@ -1501,7 +1501,7 @@ void _rtw_join_timeout_handler(struct timer_list *t)
mlmepriv.assoc_timer);
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
- if (adapter->bDriverStopped || adapter->bSurpriseRemoved)
+ if (adapter->driver_stopped || adapter->bSurpriseRemoved)
return;
spin_lock_bh(&pmlmepriv->lock);
@@ -1603,7 +1603,7 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)
if (!adapter->hw_init_completed)
return;
- if (adapter->bDriverStopped || adapter->bSurpriseRemoved)
+ if (adapter->driver_stopped || adapter->bSurpriseRemoved)
return;
if (adapter->net_closed)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 8cf3c14a0dd7..4e34249a2d26 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -408,7 +408,7 @@ void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext)
if (!padapter)
return;
- if (padapter->bDriverStopped) {
+ if (padapter->driver_stopped) {
timer_delete_sync(&pmlmeext->survey_timer);
timer_delete_sync(&pmlmeext->link_timer);
/* timer_delete_sync(&pmlmeext->ADDBA_timer); */
@@ -1962,7 +1962,7 @@ void update_mgntframe_attrib_addr(struct adapter *padapter, struct xmit_frame *p
void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe)
{
if (padapter->bSurpriseRemoved ||
- padapter->bDriverStopped) {
+ padapter->driver_stopped) {
rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf);
rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe);
return;
@@ -1980,7 +1980,7 @@ s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntfr
struct submit_ctx sctx;
if (padapter->bSurpriseRemoved ||
- padapter->bDriverStopped) {
+ padapter->driver_stopped) {
rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf);
rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe);
return ret;
@@ -2009,7 +2009,7 @@ s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmg
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
if (padapter->bSurpriseRemoved ||
- padapter->bDriverStopped) {
+ padapter->driver_stopped) {
rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf);
rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe);
return -1;
@@ -2507,7 +2507,7 @@ int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid,
i++;
- if (padapter->bDriverStopped || padapter->bSurpriseRemoved)
+ if (padapter->driver_stopped || padapter->bSurpriseRemoved)
break;
if (i < try_cnt && wait_ms > 0 && ret == _FAIL)
@@ -3052,7 +3052,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow
i++;
- if (padapter->bDriverStopped || padapter->bSurpriseRemoved)
+ if (padapter->driver_stopped || padapter->bSurpriseRemoved)
break;
if (i < try_cnt && wait_ms > 0 && ret == _FAIL)
@@ -3184,7 +3184,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int
i++;
- if (padapter->bDriverStopped || padapter->bSurpriseRemoved)
+ if (padapter->driver_stopped || padapter->bSurpriseRemoved)
break;
if (i < try_cnt && wait_ms > 0 && ret == _FAIL)
@@ -3277,7 +3277,7 @@ int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, int
i++;
- if (padapter->bDriverStopped || padapter->bSurpriseRemoved)
+ if (padapter->driver_stopped || padapter->bSurpriseRemoved)
break;
if (i < try_cnt && wait_ms > 0 && ret == _FAIL)
@@ -3706,11 +3706,11 @@ unsigned int send_beacon(struct adapter *padapter)
poll++;
} while ((poll % 10) != 0 && !bxmitok &&
!padapter->bSurpriseRemoved &&
- !padapter->bDriverStopped);
+ !padapter->driver_stopped);
- } while (false == bxmitok && issue < 100 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);
+ } while (false == bxmitok && issue < 100 && !padapter->bSurpriseRemoved && !padapter->driver_stopped);
- if (padapter->bSurpriseRemoved || padapter->bDriverStopped)
+ if (padapter->bSurpriseRemoved || padapter->driver_stopped)
return _FAIL;
if (!bxmitok)
diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index ea005d2fae29..03553dec0a93 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -242,7 +242,7 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)
return;
}
- if (padapter->bDriverStopped) {
+ if (padapter->driver_stopped) {
if (pslv < PS_STATE_S2)
return;
}
@@ -1045,7 +1045,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
}
/* TODO: the following checking need to be merged... */
- if (padapter->bDriverStopped || !padapter->bup || !padapter->hw_init_completed) {
+ if (padapter->driver_stopped || !padapter->bup || !padapter->hw_init_completed) {
ret = false;
goto exit;
}
diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c
index 16ec2248b083..92e0c574a556 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -1892,7 +1892,7 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor
/* indicate this recv_frame */
if (!pattrib->amsdu) {
- if (!padapter->bDriverStopped &&
+ if (!padapter->driver_stopped &&
!padapter->bSurpriseRemoved)
rtw_recv_indicatepkt(padapter, prframe);/* indicate this recv_frame */
@@ -1931,7 +1931,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
wlanhdr_to_ethhdr(prframe);
if (pattrib->qos != 1) {
- if (!padapter->bDriverStopped &&
+ if (!padapter->driver_stopped &&
!padapter->bSurpriseRemoved) {
rtw_recv_indicatepkt(padapter, prframe);
return _SUCCESS;
@@ -2009,7 +2009,7 @@ void rtw_reordering_ctrl_timeout_handler(struct timer_list *t)
struct adapter *padapter = preorder_ctrl->padapter;
struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
- if (padapter->bDriverStopped || padapter->bSurpriseRemoved)
+ if (padapter->driver_stopped || padapter->bSurpriseRemoved)
return;
spin_lock_bh(&ppending_recvframe_queue->lock);
@@ -2033,7 +2033,7 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frame
if (recv_indicatepkt_reorder(padapter, prframe) != _SUCCESS) { /* including perform A-MPDU Rx Ordering Buffer Control */
- if (!padapter->bDriverStopped &&
+ if (!padapter->driver_stopped &&
!padapter->bSurpriseRemoved) {
retval = _FAIL;
return retval;
@@ -2044,7 +2044,7 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frame
if (retval != _SUCCESS)
return retval;
- if (!padapter->bDriverStopped && !padapter->bSurpriseRemoved) {
+ if (!padapter->driver_stopped && !padapter->bSurpriseRemoved) {
/* indicate this recv_frame */
rtw_recv_indicatepkt(padapter, prframe);
} else {
diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c
index 180aac640a14..d18df407e365 100644
--- a/drivers/staging/rtl8723bs/hal/odm.c
+++ b/drivers/staging/rtl8723bs/hal/odm.c
@@ -257,7 +257,7 @@ static void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm)
u8 i;
struct adapter *padapter = pDM_Odm->Adapter;
- if (padapter->bDriverStopped)
+ if (padapter->driver_stopped)
return;
if (!pDM_Odm->bUseRAMask)
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
index 21b837772b24..0790209a3a8f 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
@@ -639,11 +639,11 @@ void rtl8723b_download_rsvd_page(struct adapter *padapter, u8 mstatus)
/* check rsvd page download OK. */
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bcn_valid));
poll++;
- } while (!bcn_valid && (poll % 10) != 0 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);
+ } while (!bcn_valid && (poll % 10) != 0 && !padapter->bSurpriseRemoved && !padapter->driver_stopped);
- } while (!bcn_valid && DLBcnCount <= 100 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);
+ } while (!bcn_valid && DLBcnCount <= 100 && !padapter->bSurpriseRemoved && !padapter->driver_stopped);
- if (padapter->bSurpriseRemoved || padapter->bDriverStopped) {
+ if (padapter->bSurpriseRemoved || padapter->driver_stopped) {
} else {
struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(padapter);
@@ -897,8 +897,8 @@ void rtl8723b_download_BTCoex_AP_mode_rsvd_page(struct adapter *padapter)
/* check rsvd page download OK. */
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, &bcn_valid);
poll++;
- } while (!bcn_valid && (poll % 10) != 0 && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);
- } while (!bcn_valid && (DLBcnCount <= 100) && !padapter->bSurpriseRemoved && !padapter->bDriverStopped);
+ } while (!bcn_valid && (poll % 10) != 0 && !padapter->bSurpriseRemoved && !padapter->driver_stopped);
+ } while (!bcn_valid && (DLBcnCount <= 100) && !padapter->bSurpriseRemoved && !padapter->driver_stopped);
if (bcn_valid) {
struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(padapter);
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index ecd66f090a50..210b38d23fdc 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -189,7 +189,7 @@ static s32 polling_fwdl_chksum(
do {
cnt++;
value32 = rtw_read32(adapter, REG_MCUFWDL);
- if (value32 & FWDL_ChkSum_rpt || adapter->bSurpriseRemoved || adapter->bDriverStopped)
+ if (value32 & FWDL_ChkSum_rpt || adapter->bSurpriseRemoved || adapter->driver_stopped)
break;
yield();
} while (jiffies_to_msecs(jiffies-start) < timeout_ms || cnt < min_cnt);
@@ -229,7 +229,7 @@ static s32 _FWFreeToGo(struct adapter *adapter, u32 min_cnt, u32 timeout_ms)
do {
cnt++;
value32 = rtw_read32(adapter, REG_MCUFWDL);
- if (value32 & WINTINI_RDY || adapter->bSurpriseRemoved || adapter->bDriverStopped)
+ if (value32 & WINTINI_RDY || adapter->bSurpriseRemoved || adapter->driver_stopped)
break;
yield();
} while (jiffies_to_msecs(jiffies - start) < timeout_ms || cnt < min_cnt);
@@ -384,7 +384,7 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter, bool bUsedWoWLANFw)
_FWDownloadEnable(padapter, true);
fwdl_start_time = jiffies;
while (
- !padapter->bDriverStopped &&
+ !padapter->driver_stopped &&
!padapter->bSurpriseRemoved &&
(write_fw++ < 3 || jiffies_to_msecs(jiffies - fwdl_start_time) < 500)
) {
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
index 78fa99115751..f6ad3c8b7aa3 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
@@ -660,7 +660,7 @@ static void phy_SwChnlAndSetBwMode8723B(struct adapter *Adapter)
{
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
- if (Adapter->bDriverStopped || Adapter->bSurpriseRemoved)
+ if (Adapter->driver_stopped || Adapter->bSurpriseRemoved)
return;
if (pHalData->bSwChnl) {
@@ -726,7 +726,7 @@ static void PHY_HandleSwChnlAndSetBW8723B(
}
/* Switch workitem or set timer to do switch channel or setbandwidth operation */
- if ((!Adapter->bDriverStopped) && (!Adapter->bSurpriseRemoved)) {
+ if ((!Adapter->driver_stopped) && (!Adapter->bSurpriseRemoved)) {
phy_SwChnlAndSetBwMode8723B(Adapter);
} else {
if (pHalData->bSwChnl) {
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
index e40f69c13c44..58e5bd8baf85 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
@@ -16,7 +16,7 @@ static u8 rtw_sdio_wait_enough_TxOQT_space(struct adapter *padapter, u8 agg_num)
while (pHalData->SdioTxOQTFreeSpace < agg_num) {
if (
(padapter->bSurpriseRemoved) ||
- (padapter->bDriverStopped)
+ (padapter->driver_stopped)
)
return false;
@@ -89,7 +89,7 @@ static s32 rtl8723_dequeue_writeport(struct adapter *padapter)
if (
(padapter->bSurpriseRemoved) ||
- (padapter->bDriverStopped)
+ (padapter->driver_stopped)
)
goto free_xmitbuf;
@@ -130,7 +130,7 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
return _FAIL;
}
- ret = (padapter->bDriverStopped) || (padapter->bSurpriseRemoved);
+ ret = (padapter->driver_stopped) || (padapter->bSurpriseRemoved);
if (ret)
return _FAIL;
@@ -362,7 +362,7 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
next:
if (
- (padapter->bDriverStopped) ||
+ (padapter->driver_stopped) ||
(padapter->bSurpriseRemoved)
)
return _FAIL;
diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index c4058cfe73f2..da2d9088ab5a 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -803,7 +803,7 @@ void sd_int_hdl(struct adapter *adapter)
struct hal_com_data *hal;
if (
- (adapter->bDriverStopped) || (adapter->bSurpriseRemoved)
+ (adapter->driver_stopped) || (adapter->bSurpriseRemoved)
)
return;
diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h
index c837157404d0..b2bbec7769d0 100644
--- a/drivers/staging/rtl8723bs/include/drv_types.h
+++ b/drivers/staging/rtl8723bs/include/drv_types.h
@@ -294,7 +294,7 @@ struct adapter {
void *HalData;
u32 hal_data_sz;
- s32 bDriverStopped;
+ bool driver_stopped;
s32 bSurpriseRemoved;
s32 bCardDisableWOHSM;
@@ -400,12 +400,12 @@ static inline void RTW_ENABLE_FUNC(struct adapter *padapter, int func_bit)
RTW_IS_FUNC_DISABLED((padapter), DF_IO_BIT))
#define RTW_CANNOT_RX(padapter) \
- ((padapter)->bDriverStopped || \
+ ((padapter)->driver_stopped || \
(padapter)->bSurpriseRemoved || \
RTW_IS_FUNC_DISABLED((padapter), DF_RX_BIT))
#define RTW_CANNOT_TX(padapter) \
- ((padapter)->bDriverStopped || \
+ ((padapter)->driver_stopped || \
(padapter)->bSurpriseRemoved || \
RTW_IS_FUNC_DISABLED((padapter), DF_TX_BIT))
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index fb6fc603f279..d4a3eb5d00b7 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -798,7 +798,7 @@ static int _netdev_open(struct net_device *pnetdev)
}
if (!padapter->bup) {
- padapter->bDriverStopped = false;
+ padapter->driver_stopped = false;
padapter->bSurpriseRemoved = false;
padapter->bCardDisableWOHSM = false;
@@ -866,7 +866,7 @@ static int ips_netdrv_open(struct adapter *padapter)
padapter->net_closed = false;
- padapter->bDriverStopped = false;
+ padapter->driver_stopped = false;
padapter->bCardDisableWOHSM = false;
/* padapter->bup = true; */
@@ -972,7 +972,7 @@ void rtw_dev_unload(struct adapter *padapter)
u8 cnt = 0;
if (padapter->bup) {
- padapter->bDriverStopped = true;
+ padapter->driver_stopped = true;
if (padapter->xmitpriv.ack_tx)
rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP);
@@ -1088,7 +1088,7 @@ void rtw_suspend_common(struct adapter *padapter)
while (pwrpriv->bips_processing)
msleep(1);
- if ((!padapter->bup) || (padapter->bDriverStopped) || (padapter->bSurpriseRemoved))
+ if ((!padapter->bup) || (padapter->driver_stopped) || (padapter->bSurpriseRemoved))
return;
rtw_ps_deny(padapter, PS_DENY_SUSPEND);
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index 7c8d912dd462..c1543e11a6ae 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -229,7 +229,7 @@ static struct adapter *rtw_sdio_if1_init(struct dvobj_priv *dvobj)
padapter->dvobj = dvobj;
dvobj->if1 = padapter;
- padapter->bDriverStopped = true;
+ padapter->driver_stopped = true;
dvobj->padapters = padapter;
padapter->iface_id = 0;
@@ -415,7 +415,7 @@ static int rtw_sdio_suspend(struct device *dev)
struct pwrctrl_priv *pwrpriv = dvobj_to_pwrctl(psdpriv);
struct adapter *padapter = psdpriv->if1;
- if (padapter->bDriverStopped)
+ if (padapter->driver_stopped)
return 0;
if (pwrpriv->bInSuspend)
--
2.54.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/4] staging: rtl8723bs: wrap line over 100 characters
2026-07-15 17:16 [PATCH 0/4] staging: rtl8723bs: Changing two struct members Dalvin-Ehinoma Noah Aiguobas
2026-07-15 17:16 ` [PATCH 1/4] staging: rtl8723bs: change struct member bDriverStopped Dalvin-Ehinoma Noah Aiguobas
@ 2026-07-15 17:16 ` Dalvin-Ehinoma Noah Aiguobas
2026-07-15 17:16 ` [PATCH 3/4] staging: rtl8723bs: change struct member bSurpriseRemoved Dalvin-Ehinoma Noah Aiguobas
2026-07-15 17:16 ` [PATCH 4/4] staging: rtl8723bs: fix Alignment should match open parenthesis in rtw_mlme_ext.c Dalvin-Ehinoma Noah Aiguobas
3 siblings, 0 replies; 5+ messages in thread
From: Dalvin-Ehinoma Noah Aiguobas @ 2026-07-15 17:16 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, Dalvin-Ehinoma Noah Aiguobas
Fix checkpatch warning by wrapping the lines.
Signed-off-by: Dalvin-Ehinoma Noah Aiguobas <fliegbert2@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 3 ++-
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 12 ++++++++----
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 ++-
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 4e34249a2d26..4a7fe5af0ffa 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -3708,7 +3708,8 @@ unsigned int send_beacon(struct adapter *padapter)
!padapter->bSurpriseRemoved &&
!padapter->driver_stopped);
- } while (false == bxmitok && issue < 100 && !padapter->bSurpriseRemoved && !padapter->driver_stopped);
+ } while (false == bxmitok && issue < 100 && !padapter->bSurpriseRemoved &&
+ !padapter->driver_stopped);
if (padapter->bSurpriseRemoved || padapter->driver_stopped)
return _FAIL;
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
index 0790209a3a8f..d2b44ad60a4c 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
@@ -639,9 +639,11 @@ void rtl8723b_download_rsvd_page(struct adapter *padapter, u8 mstatus)
/* check rsvd page download OK. */
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bcn_valid));
poll++;
- } while (!bcn_valid && (poll % 10) != 0 && !padapter->bSurpriseRemoved && !padapter->driver_stopped);
+ } while (!bcn_valid && (poll % 10) != 0 && !padapter->bSurpriseRemoved &&
+ !padapter->driver_stopped);
- } while (!bcn_valid && DLBcnCount <= 100 && !padapter->bSurpriseRemoved && !padapter->driver_stopped);
+ } while (!bcn_valid && DLBcnCount <= 100 && !padapter->bSurpriseRemoved &&
+ !padapter->driver_stopped);
if (padapter->bSurpriseRemoved || padapter->driver_stopped) {
} else {
@@ -897,8 +899,10 @@ void rtl8723b_download_BTCoex_AP_mode_rsvd_page(struct adapter *padapter)
/* check rsvd page download OK. */
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, &bcn_valid);
poll++;
- } while (!bcn_valid && (poll % 10) != 0 && !padapter->bSurpriseRemoved && !padapter->driver_stopped);
- } while (!bcn_valid && (DLBcnCount <= 100) && !padapter->bSurpriseRemoved && !padapter->driver_stopped);
+ } while (!bcn_valid && (poll % 10) != 0 && !padapter->bSurpriseRemoved &&
+ !padapter->driver_stopped);
+ } while (!bcn_valid && (DLBcnCount <= 100) && !padapter->bSurpriseRemoved &&
+ !padapter->driver_stopped);
if (bcn_valid) {
struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(padapter);
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 210b38d23fdc..08c77348b307 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -189,7 +189,8 @@ static s32 polling_fwdl_chksum(
do {
cnt++;
value32 = rtw_read32(adapter, REG_MCUFWDL);
- if (value32 & FWDL_ChkSum_rpt || adapter->bSurpriseRemoved || adapter->driver_stopped)
+ if (value32 & FWDL_ChkSum_rpt || adapter->bSurpriseRemoved ||
+ adapter->driver_stopped)
break;
yield();
} while (jiffies_to_msecs(jiffies-start) < timeout_ms || cnt < min_cnt);
--
2.54.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/4] staging: rtl8723bs: change struct member bSurpriseRemoved
2026-07-15 17:16 [PATCH 0/4] staging: rtl8723bs: Changing two struct members Dalvin-Ehinoma Noah Aiguobas
2026-07-15 17:16 ` [PATCH 1/4] staging: rtl8723bs: change struct member bDriverStopped Dalvin-Ehinoma Noah Aiguobas
2026-07-15 17:16 ` [PATCH 2/4] staging: rtl8723bs: wrap line over 100 characters Dalvin-Ehinoma Noah Aiguobas
@ 2026-07-15 17:16 ` Dalvin-Ehinoma Noah Aiguobas
2026-07-15 17:16 ` [PATCH 4/4] staging: rtl8723bs: fix Alignment should match open parenthesis in rtw_mlme_ext.c Dalvin-Ehinoma Noah Aiguobas
3 siblings, 0 replies; 5+ messages in thread
From: Dalvin-Ehinoma Noah Aiguobas @ 2026-07-15 17:16 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, Dalvin-Ehinoma Noah Aiguobas
Member name does not adhere to linux coding style.
Changed type as well since b indicates a boolean type and in every
instance of setting the variable the values true and false are used.
bSurpriseRemoved -> surprise_removed
Signed-off-by: Dalvin-Ehinoma Noah Aiguobas <fliegbert2@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_btcoex.c | 2 +-
drivers/staging/rtl8723bs/core/rtw_cmd.c | 8 ++---
drivers/staging/rtl8723bs/core/rtw_mlme.c | 8 ++---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 20 ++++++------
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 12 +++----
drivers/staging/rtl8723bs/core/rtw_recv.c | 10 +++---
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 12 +++----
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 8 ++---
.../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 4 +--
.../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 8 ++---
drivers/staging/rtl8723bs/hal/sdio_ops.c | 2 +-
drivers/staging/rtl8723bs/include/drv_types.h | 8 ++---
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 10 +++---
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 4 +--
.../staging/rtl8723bs/os_dep/sdio_ops_linux.c | 32 +++++++++----------
15 files changed, 74 insertions(+), 74 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
index 9e00424d00bd..24b6742509d8 100644
--- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c
+++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
@@ -23,7 +23,7 @@ void rtw_btcoex_halt_notify(struct adapter *padapter)
if (!padapter->bup)
return;
- if (padapter->bSurpriseRemoved)
+ if (padapter->surprise_removed)
return;
hal_btcoex_HaltNotify(padapter);
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index df6b118ee9c9..daad3e90ee05 100644
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -396,11 +396,11 @@ int rtw_cmd_thread(void *context)
break;
}
- if (padapter->driver_stopped || padapter->bSurpriseRemoved) {
+ if (padapter->driver_stopped || padapter->surprise_removed) {
netdev_dbg(padapter->pnetdev,
"%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
__func__, padapter->driver_stopped,
- padapter->bSurpriseRemoved, __LINE__);
+ padapter->surprise_removed, __LINE__);
break;
}
@@ -419,11 +419,11 @@ int rtw_cmd_thread(void *context)
continue;
_next:
- if (padapter->driver_stopped || padapter->bSurpriseRemoved) {
+ if (padapter->driver_stopped || padapter->surprise_removed) {
netdev_dbg(padapter->pnetdev,
"%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
__func__, padapter->driver_stopped,
- padapter->bSurpriseRemoved, __LINE__);
+ padapter->surprise_removed, __LINE__);
break;
}
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 2606fc6b8c5c..0d9feedfaa55 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -264,7 +264,7 @@ void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)
bool rtw_if_up(struct adapter *padapter)
{
- if (padapter->driver_stopped || padapter->bSurpriseRemoved ||
+ if (padapter->driver_stopped || padapter->surprise_removed ||
!check_fwstate(&padapter->mlmepriv, _FW_LINKED))
return false;
@@ -930,7 +930,7 @@ void rtw_scan_abort(struct adapter *adapter)
pmlmeext->scan_abort = true;
while (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)
&& jiffies_to_msecs(start) <= 200) {
- if (adapter->driver_stopped || adapter->bSurpriseRemoved)
+ if (adapter->driver_stopped || adapter->surprise_removed)
break;
msleep(20);
@@ -1501,7 +1501,7 @@ void _rtw_join_timeout_handler(struct timer_list *t)
mlmepriv.assoc_timer);
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
- if (adapter->driver_stopped || adapter->bSurpriseRemoved)
+ if (adapter->driver_stopped || adapter->surprise_removed)
return;
spin_lock_bh(&pmlmepriv->lock);
@@ -1603,7 +1603,7 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter)
if (!adapter->hw_init_completed)
return;
- if (adapter->driver_stopped || adapter->bSurpriseRemoved)
+ if (adapter->driver_stopped || adapter->surprise_removed)
return;
if (adapter->net_closed)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 4a7fe5af0ffa..5206cd464778 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -1961,7 +1961,7 @@ void update_mgntframe_attrib_addr(struct adapter *padapter, struct xmit_frame *p
void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe)
{
- if (padapter->bSurpriseRemoved ||
+ if (padapter->surprise_removed ||
padapter->driver_stopped) {
rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf);
rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe);
@@ -1979,7 +1979,7 @@ s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntfr
struct xmit_buf *pxmitbuf = pmgntframe->pxmitbuf;
struct submit_ctx sctx;
- if (padapter->bSurpriseRemoved ||
+ if (padapter->surprise_removed ||
padapter->driver_stopped) {
rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf);
rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe);
@@ -2008,7 +2008,7 @@ s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmg
u32 timeout_ms = 500;/* 500ms */
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
- if (padapter->bSurpriseRemoved ||
+ if (padapter->surprise_removed ||
padapter->driver_stopped) {
rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf);
rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe);
@@ -2507,7 +2507,7 @@ int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid,
i++;
- if (padapter->driver_stopped || padapter->bSurpriseRemoved)
+ if (padapter->driver_stopped || padapter->surprise_removed)
break;
if (i < try_cnt && wait_ms > 0 && ret == _FAIL)
@@ -3052,7 +3052,7 @@ int issue_nulldata(struct adapter *padapter, unsigned char *da, unsigned int pow
i++;
- if (padapter->driver_stopped || padapter->bSurpriseRemoved)
+ if (padapter->driver_stopped || padapter->surprise_removed)
break;
if (i < try_cnt && wait_ms > 0 && ret == _FAIL)
@@ -3184,7 +3184,7 @@ int issue_qos_nulldata(struct adapter *padapter, unsigned char *da, u16 tid, int
i++;
- if (padapter->driver_stopped || padapter->bSurpriseRemoved)
+ if (padapter->driver_stopped || padapter->surprise_removed)
break;
if (i < try_cnt && wait_ms > 0 && ret == _FAIL)
@@ -3277,7 +3277,7 @@ int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, int
i++;
- if (padapter->driver_stopped || padapter->bSurpriseRemoved)
+ if (padapter->driver_stopped || padapter->surprise_removed)
break;
if (i < try_cnt && wait_ms > 0 && ret == _FAIL)
@@ -3705,13 +3705,13 @@ unsigned int send_beacon(struct adapter *padapter)
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bxmitok));
poll++;
} while ((poll % 10) != 0 && !bxmitok &&
- !padapter->bSurpriseRemoved &&
+ !padapter->surprise_removed &&
!padapter->driver_stopped);
- } while (false == bxmitok && issue < 100 && !padapter->bSurpriseRemoved &&
+ } while (false == bxmitok && issue < 100 && !padapter->surprise_removed &&
!padapter->driver_stopped);
- if (padapter->bSurpriseRemoved || padapter->driver_stopped)
+ if (padapter->surprise_removed || padapter->driver_stopped)
return _FAIL;
if (!bxmitok)
diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
index 03553dec0a93..65be5e993524 100644
--- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c
@@ -237,7 +237,7 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)
return;
}
- if ((padapter->bSurpriseRemoved) || !(padapter->hw_init_completed)) {
+ if ((padapter->surprise_removed) || !(padapter->hw_init_completed)) {
pwrpriv->cpwm = PS_STATE_S4;
return;
}
@@ -404,7 +404,7 @@ int LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms)
if (bAwake)
return 0;
- if (padapter->bSurpriseRemoved)
+ if (padapter->surprise_removed)
return -ENODEV;
if (jiffies_to_msecs(jiffies - start_time) > delay_ms)
@@ -480,7 +480,7 @@ void LeaveAllPowerSaveModeDirect(struct adapter *Adapter)
struct mlme_priv *pmlmepriv = &Adapter->mlmepriv;
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(Adapter);
- if (Adapter->bSurpriseRemoved)
+ if (Adapter->surprise_removed)
return;
if (check_fwstate(pmlmepriv, _FW_LINKED)) { /* connect */
@@ -514,7 +514,7 @@ void LeaveAllPowerSaveMode(struct adapter *Adapter)
if (!Adapter->bup)
return;
- if (Adapter->bSurpriseRemoved)
+ if (Adapter->surprise_removed)
return;
if (check_fwstate(&dvobj->padapters->mlmepriv, WIFI_ASOC_STATE))
@@ -548,7 +548,7 @@ void LPS_Leave_check(struct adapter *padapter)
while (1) {
mutex_lock(&pwrpriv->lock);
- if (padapter->bSurpriseRemoved ||
+ if (padapter->surprise_removed ||
!(padapter->hw_init_completed) ||
(pwrpriv->pwr_mode == PS_MODE_ACTIVE))
bReady = true;
@@ -1089,7 +1089,7 @@ int rtw_pm_set_ips(struct adapter *padapter, u8 mode)
return 0;
} else if (mode == IPS_NONE) {
rtw_ips_mode_req(pwrctrlpriv, mode);
- if ((padapter->bSurpriseRemoved == 0) && (rtw_pwr_wakeup(padapter) == _FAIL))
+ if ((padapter->surprise_removed == 0) && (rtw_pwr_wakeup(padapter) == _FAIL))
return -EFAULT;
} else {
return -EINVAL;
diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c
index 92e0c574a556..240866e57866 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -1893,7 +1893,7 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor
/* indicate this recv_frame */
if (!pattrib->amsdu) {
if (!padapter->driver_stopped &&
- !padapter->bSurpriseRemoved)
+ !padapter->surprise_removed)
rtw_recv_indicatepkt(padapter, prframe);/* indicate this recv_frame */
} else if (pattrib->amsdu == 1) {
@@ -1932,7 +1932,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
if (pattrib->qos != 1) {
if (!padapter->driver_stopped &&
- !padapter->bSurpriseRemoved) {
+ !padapter->surprise_removed) {
rtw_recv_indicatepkt(padapter, prframe);
return _SUCCESS;
}
@@ -2009,7 +2009,7 @@ void rtw_reordering_ctrl_timeout_handler(struct timer_list *t)
struct adapter *padapter = preorder_ctrl->padapter;
struct __queue *ppending_recvframe_queue = &preorder_ctrl->pending_recvframe_queue;
- if (padapter->driver_stopped || padapter->bSurpriseRemoved)
+ if (padapter->driver_stopped || padapter->surprise_removed)
return;
spin_lock_bh(&ppending_recvframe_queue->lock);
@@ -2034,7 +2034,7 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frame
if (recv_indicatepkt_reorder(padapter, prframe) != _SUCCESS) { /* including perform A-MPDU Rx Ordering Buffer Control */
if (!padapter->driver_stopped &&
- !padapter->bSurpriseRemoved) {
+ !padapter->surprise_removed) {
retval = _FAIL;
return retval;
}
@@ -2044,7 +2044,7 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frame
if (retval != _SUCCESS)
return retval;
- if (!padapter->driver_stopped && !padapter->bSurpriseRemoved) {
+ if (!padapter->driver_stopped && !padapter->surprise_removed) {
/* indicate this recv_frame */
rtw_recv_indicatepkt(padapter, prframe);
} else {
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
index d2b44ad60a4c..858471b8d65a 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
@@ -59,7 +59,7 @@ s32 FillH2CCmd8723B(struct adapter *padapter, u8 ElementID, u32 CmdLen, u8 *pCmd
if (CmdLen > RTL8723B_MAX_CMD_LEN)
goto exit;
- if (padapter->bSurpriseRemoved)
+ if (padapter->surprise_removed)
goto exit;
/* pay attention to if race condition happened in H2C cmd setting. */
@@ -639,13 +639,13 @@ void rtl8723b_download_rsvd_page(struct adapter *padapter, u8 mstatus)
/* check rsvd page download OK. */
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, (u8 *)(&bcn_valid));
poll++;
- } while (!bcn_valid && (poll % 10) != 0 && !padapter->bSurpriseRemoved &&
+ } while (!bcn_valid && (poll % 10) != 0 && !padapter->surprise_removed &&
!padapter->driver_stopped);
- } while (!bcn_valid && DLBcnCount <= 100 && !padapter->bSurpriseRemoved &&
+ } while (!bcn_valid && DLBcnCount <= 100 && !padapter->surprise_removed &&
!padapter->driver_stopped);
- if (padapter->bSurpriseRemoved || padapter->driver_stopped) {
+ if (padapter->surprise_removed || padapter->driver_stopped) {
} else {
struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(padapter);
@@ -899,9 +899,9 @@ void rtl8723b_download_BTCoex_AP_mode_rsvd_page(struct adapter *padapter)
/* check rsvd page download OK. */
rtw_hal_get_hwreg(padapter, HW_VAR_BCN_VALID, &bcn_valid);
poll++;
- } while (!bcn_valid && (poll % 10) != 0 && !padapter->bSurpriseRemoved &&
+ } while (!bcn_valid && (poll % 10) != 0 && !padapter->surprise_removed &&
!padapter->driver_stopped);
- } while (!bcn_valid && (DLBcnCount <= 100) && !padapter->bSurpriseRemoved &&
+ } while (!bcn_valid && (DLBcnCount <= 100) && !padapter->surprise_removed &&
!padapter->driver_stopped);
if (bcn_valid) {
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 08c77348b307..028fb78f940c 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -189,7 +189,7 @@ static s32 polling_fwdl_chksum(
do {
cnt++;
value32 = rtw_read32(adapter, REG_MCUFWDL);
- if (value32 & FWDL_ChkSum_rpt || adapter->bSurpriseRemoved ||
+ if (value32 & FWDL_ChkSum_rpt || adapter->surprise_removed ||
adapter->driver_stopped)
break;
yield();
@@ -230,7 +230,7 @@ static s32 _FWFreeToGo(struct adapter *adapter, u32 min_cnt, u32 timeout_ms)
do {
cnt++;
value32 = rtw_read32(adapter, REG_MCUFWDL);
- if (value32 & WINTINI_RDY || adapter->bSurpriseRemoved || adapter->driver_stopped)
+ if (value32 & WINTINI_RDY || adapter->surprise_removed || adapter->driver_stopped)
break;
yield();
} while (jiffies_to_msecs(jiffies - start) < timeout_ms || cnt < min_cnt);
@@ -386,7 +386,7 @@ s32 rtl8723b_FirmwareDownload(struct adapter *padapter, bool bUsedWoWLANFw)
fwdl_start_time = jiffies;
while (
!padapter->driver_stopped &&
- !padapter->bSurpriseRemoved &&
+ !padapter->surprise_removed &&
(write_fw++ < 3 || jiffies_to_msecs(jiffies - fwdl_start_time) < 500)
) {
/* reset FWDL chksum */
@@ -2743,7 +2743,7 @@ void GetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
u32 valRCR;
if (
- padapter->bSurpriseRemoved ||
+ padapter->surprise_removed ||
(adapter_to_pwrctl(padapter)->rf_pwrstate == rf_off)
) {
/* If it is in HW/SW Radio OFF or IPS state, we do not check Fw LPS Leave, */
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
index f6ad3c8b7aa3..eff18320630f 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
@@ -660,7 +660,7 @@ static void phy_SwChnlAndSetBwMode8723B(struct adapter *Adapter)
{
struct hal_com_data *pHalData = GET_HAL_DATA(Adapter);
- if (Adapter->driver_stopped || Adapter->bSurpriseRemoved)
+ if (Adapter->driver_stopped || Adapter->surprise_removed)
return;
if (pHalData->bSwChnl) {
@@ -726,7 +726,7 @@ static void PHY_HandleSwChnlAndSetBW8723B(
}
/* Switch workitem or set timer to do switch channel or setbandwidth operation */
- if ((!Adapter->driver_stopped) && (!Adapter->bSurpriseRemoved)) {
+ if ((!Adapter->driver_stopped) && (!Adapter->surprise_removed)) {
phy_SwChnlAndSetBwMode8723B(Adapter);
} else {
if (pHalData->bSwChnl) {
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
index 58e5bd8baf85..9f17a1ca979e 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
@@ -15,7 +15,7 @@ static u8 rtw_sdio_wait_enough_TxOQT_space(struct adapter *padapter, u8 agg_num)
while (pHalData->SdioTxOQTFreeSpace < agg_num) {
if (
- (padapter->bSurpriseRemoved) ||
+ (padapter->surprise_removed) ||
(padapter->driver_stopped)
)
return false;
@@ -88,7 +88,7 @@ static s32 rtl8723_dequeue_writeport(struct adapter *padapter)
}
if (
- (padapter->bSurpriseRemoved) ||
+ (padapter->surprise_removed) ||
(padapter->driver_stopped)
)
goto free_xmitbuf;
@@ -130,7 +130,7 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
return _FAIL;
}
- ret = (padapter->driver_stopped) || (padapter->bSurpriseRemoved);
+ ret = (padapter->driver_stopped) || (padapter->surprise_removed);
if (ret)
return _FAIL;
@@ -363,7 +363,7 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
next:
if (
(padapter->driver_stopped) ||
- (padapter->bSurpriseRemoved)
+ (padapter->surprise_removed)
)
return _FAIL;
diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index da2d9088ab5a..ca50f8a5c32e 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -803,7 +803,7 @@ void sd_int_hdl(struct adapter *adapter)
struct hal_com_data *hal;
if (
- (adapter->driver_stopped) || (adapter->bSurpriseRemoved)
+ (adapter->driver_stopped) || (adapter->surprise_removed)
)
return;
diff --git a/drivers/staging/rtl8723bs/include/drv_types.h b/drivers/staging/rtl8723bs/include/drv_types.h
index b2bbec7769d0..0a0a9b4d6a9a 100644
--- a/drivers/staging/rtl8723bs/include/drv_types.h
+++ b/drivers/staging/rtl8723bs/include/drv_types.h
@@ -295,7 +295,7 @@ struct adapter {
u32 hal_data_sz;
bool driver_stopped;
- s32 bSurpriseRemoved;
+ bool surprise_removed;
s32 bCardDisableWOHSM;
u32 IsrContent;
@@ -396,17 +396,17 @@ static inline void RTW_ENABLE_FUNC(struct adapter *padapter, int func_bit)
#define RTW_IS_FUNC_DISABLED(padapter, func_bit) (atomic_read(&adapter_to_dvobj(padapter)->disable_func) & (func_bit))
#define RTW_CANNOT_IO(padapter) \
- ((padapter)->bSurpriseRemoved || \
+ ((padapter)->surprise_removed || \
RTW_IS_FUNC_DISABLED((padapter), DF_IO_BIT))
#define RTW_CANNOT_RX(padapter) \
((padapter)->driver_stopped || \
- (padapter)->bSurpriseRemoved || \
+ (padapter)->surprise_removed || \
RTW_IS_FUNC_DISABLED((padapter), DF_RX_BIT))
#define RTW_CANNOT_TX(padapter) \
((padapter)->driver_stopped || \
- (padapter)->bSurpriseRemoved || \
+ (padapter)->surprise_removed || \
RTW_IS_FUNC_DISABLED((padapter), DF_TX_BIT))
static inline u8 *myid(struct eeprom_priv *peepriv)
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index d4a3eb5d00b7..a848ab4154ea 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -799,7 +799,7 @@ static int _netdev_open(struct net_device *pnetdev)
if (!padapter->bup) {
padapter->driver_stopped = false;
- padapter->bSurpriseRemoved = false;
+ padapter->surprise_removed = false;
padapter->bCardDisableWOHSM = false;
status = rtw_hal_init(padapter);
@@ -902,7 +902,7 @@ void rtw_ips_pwr_down(struct adapter *padapter)
void rtw_ips_dev_unload(struct adapter *padapter)
{
- if (!padapter->bSurpriseRemoved)
+ if (!padapter->surprise_removed)
rtw_hal_deinit(padapter);
}
@@ -1000,13 +1000,13 @@ void rtw_dev_unload(struct adapter *padapter)
"%s: driver not in IPS\n", __func__);
}
- if (!padapter->bSurpriseRemoved) {
+ if (!padapter->surprise_removed) {
hal_btcoex_IpsNotify(padapter, pwrctl->ips_mode_req);
/* amy modify 20120221 for power seq is different between driver open and ips */
rtw_hal_deinit(padapter);
- padapter->bSurpriseRemoved = true;
+ padapter->surprise_removed = true;
}
padapter->bup = false;
@@ -1088,7 +1088,7 @@ void rtw_suspend_common(struct adapter *padapter)
while (pwrpriv->bips_processing)
msleep(1);
- if ((!padapter->bup) || (padapter->driver_stopped) || (padapter->bSurpriseRemoved))
+ if ((!padapter->bup) || (padapter->driver_stopped) || (padapter->surprise_removed))
return;
rtw_ps_deny(padapter, PS_DENY_SUSPEND);
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index c1543e11a6ae..3065b89182e2 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -383,7 +383,7 @@ static void rtw_dev_remove(struct sdio_func *func)
rtw_unregister_netdevs(dvobj);
- if (!padapter->bSurpriseRemoved) {
+ if (!padapter->surprise_removed) {
int err;
/* test surprise remove */
@@ -391,7 +391,7 @@ static void rtw_dev_remove(struct sdio_func *func)
sdio_readb(func, 0, &err);
sdio_release_host(func);
if (err == -ENOMEDIUM)
- padapter->bSurpriseRemoved = true;
+ padapter->surprise_removed = true;
}
rtw_ps_deny(padapter, PS_DENY_DRV_REMOVE);
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c b/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c
index e9a2f3f7ec74..71d3e4babd31 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c
@@ -42,7 +42,7 @@ s32 _sd_cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata)
psdiodev = pintfhdl->pintf_dev;
psdio = &psdiodev->intf_data;
- if (padapter->bSurpriseRemoved)
+ if (padapter->surprise_removed)
return err;
func = psdio->func;
@@ -74,7 +74,7 @@ s32 sd_cmd52_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata)
psdiodev = pintfhdl->pintf_dev;
psdio = &psdiodev->intf_data;
- if (padapter->bSurpriseRemoved)
+ if (padapter->surprise_removed)
return err;
func = psdio->func;
@@ -106,7 +106,7 @@ s32 _sd_cmd52_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata)
psdiodev = pintfhdl->pintf_dev;
psdio = &psdiodev->intf_data;
- if (padapter->bSurpriseRemoved)
+ if (padapter->surprise_removed)
return err;
func = psdio->func;
@@ -138,7 +138,7 @@ s32 sd_cmd52_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *pdata)
psdiodev = pintfhdl->pintf_dev;
psdio = &psdiodev->intf_data;
- if (padapter->bSurpriseRemoved)
+ if (padapter->surprise_removed)
return err;
func = psdio->func;
@@ -166,7 +166,7 @@ u8 sd_read8(struct intf_hdl *pintfhdl, u32 addr, s32 *err)
psdiodev = pintfhdl->pintf_dev;
psdio = &psdiodev->intf_data;
- if (padapter->bSurpriseRemoved)
+ if (padapter->surprise_removed)
return v;
func = psdio->func;
@@ -193,7 +193,7 @@ u32 sd_read32(struct intf_hdl *pintfhdl, u32 addr, s32 *err)
psdiodev = pintfhdl->pintf_dev;
psdio = &psdiodev->intf_data;
- if (padapter->bSurpriseRemoved)
+ if (padapter->surprise_removed)
return v;
func = psdio->func;
@@ -222,10 +222,10 @@ u32 sd_read32(struct intf_hdl *pintfhdl, u32 addr, s32 *err)
}
if ((-ESHUTDOWN == *err) || (-ENODEV == *err))
- padapter->bSurpriseRemoved = true;
+ padapter->surprise_removed = true;
if (rtw_inc_and_chk_continual_io_error(psdiodev)) {
- padapter->bSurpriseRemoved = true;
+ padapter->surprise_removed = true;
break;
}
}
@@ -245,7 +245,7 @@ void sd_write8(struct intf_hdl *pintfhdl, u32 addr, u8 v, s32 *err)
psdiodev = pintfhdl->pintf_dev;
psdio = &psdiodev->intf_data;
- if (padapter->bSurpriseRemoved)
+ if (padapter->surprise_removed)
return;
func = psdio->func;
@@ -270,7 +270,7 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u32 v, s32 *err)
psdiodev = pintfhdl->pintf_dev;
psdio = &psdiodev->intf_data;
- if (padapter->bSurpriseRemoved)
+ if (padapter->surprise_removed)
return;
func = psdio->func;
@@ -298,10 +298,10 @@ void sd_write32(struct intf_hdl *pintfhdl, u32 addr, u32 v, s32 *err)
}
if ((-ESHUTDOWN == *err) || (-ENODEV == *err))
- padapter->bSurpriseRemoved = true;
+ padapter->surprise_removed = true;
if (rtw_inc_and_chk_continual_io_error(psdiodev)) {
- padapter->bSurpriseRemoved = true;
+ padapter->surprise_removed = true;
break;
}
}
@@ -336,7 +336,7 @@ s32 _sd_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata)
psdiodev = pintfhdl->pintf_dev;
psdio = &psdiodev->intf_data;
- if (padapter->bSurpriseRemoved)
+ if (padapter->surprise_removed)
return err;
func = psdio->func;
@@ -386,7 +386,7 @@ s32 sd_read(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata)
psdiodev = pintfhdl->pintf_dev;
psdio = &psdiodev->intf_data;
- if (padapter->bSurpriseRemoved)
+ if (padapter->surprise_removed)
return err;
func = psdio->func;
@@ -429,7 +429,7 @@ s32 _sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata)
psdiodev = pintfhdl->pintf_dev;
psdio = &psdiodev->intf_data;
- if (padapter->bSurpriseRemoved)
+ if (padapter->surprise_removed)
return err;
func = psdio->func;
@@ -480,7 +480,7 @@ s32 sd_write(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, void *pdata)
psdiodev = pintfhdl->pintf_dev;
psdio = &psdiodev->intf_data;
- if (padapter->bSurpriseRemoved)
+ if (padapter->surprise_removed)
return err;
func = psdio->func;
--
2.54.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 4/4] staging: rtl8723bs: fix Alignment should match open parenthesis in rtw_mlme_ext.c
2026-07-15 17:16 [PATCH 0/4] staging: rtl8723bs: Changing two struct members Dalvin-Ehinoma Noah Aiguobas
` (2 preceding siblings ...)
2026-07-15 17:16 ` [PATCH 3/4] staging: rtl8723bs: change struct member bSurpriseRemoved Dalvin-Ehinoma Noah Aiguobas
@ 2026-07-15 17:16 ` Dalvin-Ehinoma Noah Aiguobas
3 siblings, 0 replies; 5+ messages in thread
From: Dalvin-Ehinoma Noah Aiguobas @ 2026-07-15 17:16 UTC (permalink / raw)
To: gregkh; +Cc: linux-staging, linux-kernel, Dalvin-Ehinoma Noah Aiguobas
Fixing almost every occurrence of checkpatch warning
Alignment should match open parenthesis in rtw_mlme_ext.c.
Signed-off-by: Dalvin-Ehinoma Noah Aiguobas <fliegbert2@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 60 +++++++++----------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 5206cd464778..379d964769ad 100644
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -256,8 +256,8 @@ static void init_mlme_ext_priv_value(struct adapter *padapter)
}
static int has_channel(struct rt_channel_info *channel_set,
- u8 chanset_size,
- u8 chan)
+ u8 chanset_size,
+ u8 chan)
{
int i;
@@ -269,8 +269,8 @@ static int has_channel(struct rt_channel_info *channel_set,
}
static void init_channel_list(struct adapter *padapter, struct rt_channel_info *channel_set,
- u8 chanset_size,
- struct p2p_channels *channel_list)
+ u8 chanset_size,
+ struct p2p_channels *channel_list)
{
static const struct p2p_oper_class_map op_class[] = {
{ IEEE80211G, 81, 1, 13, 1, BW20 },
@@ -302,7 +302,7 @@ static void init_channel_list(struct adapter *padapter, struct rt_channel_info *
continue;
if ((0 < (padapter->registrypriv.bw_mode & 0xf0)) &&
- ((o->bw == BW40MINUS) || (o->bw == BW40PLUS)))
+ ((o->bw == BW40MINUS) || (o->bw == BW40PLUS)))
continue;
if (!reg) {
@@ -515,7 +515,7 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame)
}
p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, WLAN_EID_SSID, (int *)&ielen,
- len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_);
+ len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_);
/* check (wildcard) SSID */
if (p) {
@@ -715,8 +715,8 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
seq = le16_to_cpu(*(__le16 *)((SIZE_PTR)pframe + WLAN_HDR_A3_LEN + offset + 2));
if (auth_mode == 2 &&
- psecuritypriv->dot11_privacy_algrthm != _WEP40_ &&
- psecuritypriv->dot11_privacy_algrthm != _WEP104_)
+ psecuritypriv->dot11_privacy_algrthm != _WEP40_ &&
+ psecuritypriv->dot11_privacy_algrthm != _WEP104_)
auth_mode = 0;
if ((algorithm > 0 && auth_mode == 0) || /* rx a shared-key auth but shared not enabled */
@@ -797,7 +797,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
pstat->authalg = algorithm;
} else if (seq == 3) {
p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + 4 + _AUTH_IE_OFFSET_, WLAN_EID_CHALLENGE, (int *)&ie_len,
- len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ - 4);
+ len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_ - 4);
if (!p || ie_len != 128) {
status = WLAN_STATUS_CHALLENGE_FAIL;
@@ -883,7 +883,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram
if (pmlmeinfo->auth_algo == dot11AuthAlgrthm_Shared) {
/* legendary shared system */
p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _AUTH_IE_OFFSET_, WLAN_EID_CHALLENGE, (int *)&len,
- pkt_len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);
+ pkt_len - WLAN_HDR_A3_LEN - _AUTH_IE_OFFSET_);
if (!p)
goto authclnt_fail;
@@ -992,7 +992,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
/* now we should check all the fields... */
/* checking SSID */
p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, WLAN_EID_SSID, &ie_len,
- pkt_len - WLAN_HDR_A3_LEN - ie_offset);
+ pkt_len - WLAN_HDR_A3_LEN - ie_offset);
if (!p || ie_len == 0) {
/* broadcast ssid, however it is not allowed in assocreq */
@@ -1027,7 +1027,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
support_rate_num = ie_len;
p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, WLAN_EID_EXT_SUPP_RATES, &ie_len,
- pkt_len - WLAN_HDR_A3_LEN - ie_offset);
+ pkt_len - WLAN_HDR_A3_LEN - ie_offset);
if (p) {
if (support_rate_num + ie_len <= sizeof(supportRate)) {
memcpy(supportRate + support_rate_num, p + 2, ie_len);
@@ -1230,8 +1230,8 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
}
if ((pstat->flags & WLAN_STA_HT) &&
- ((pstat->wpa2_pairwise_cipher & WPA_CIPHER_TKIP) ||
- (pstat->wpa_pairwise_cipher & WPA_CIPHER_TKIP))) {
+ ((pstat->wpa2_pairwise_cipher & WPA_CIPHER_TKIP) ||
+ (pstat->wpa_pairwise_cipher & WPA_CIPHER_TKIP))) {
/* status = WLAN_STATUS_CIPHER_SUITE_REJECTED; */
/* goto OnAssocReqFail; */
}
@@ -1962,7 +1962,7 @@ void update_mgntframe_attrib_addr(struct adapter *padapter, struct xmit_frame *p
void dump_mgntframe(struct adapter *padapter, struct xmit_frame *pmgntframe)
{
if (padapter->surprise_removed ||
- padapter->driver_stopped) {
+ padapter->driver_stopped) {
rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf);
rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe);
return;
@@ -1980,7 +1980,7 @@ s32 dump_mgntframe_and_wait(struct adapter *padapter, struct xmit_frame *pmgntfr
struct submit_ctx sctx;
if (padapter->surprise_removed ||
- padapter->driver_stopped) {
+ padapter->driver_stopped) {
rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf);
rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe);
return ret;
@@ -2009,7 +2009,7 @@ s32 dump_mgntframe_and_wait_ack(struct adapter *padapter, struct xmit_frame *pmg
struct xmit_priv *pxmitpriv = &padapter->xmitpriv;
if (padapter->surprise_removed ||
- padapter->driver_stopped) {
+ padapter->driver_stopped) {
rtw_free_xmitbuf(&padapter->xmitpriv, pmgntframe->pxmitbuf);
rtw_free_xmitframe(&padapter->xmitpriv, pmgntframe);
return -1;
@@ -2496,7 +2496,7 @@ inline void issue_probereq(struct adapter *padapter, struct ndis_802_11_ssid *ps
}
int issue_probereq_ex(struct adapter *padapter, struct ndis_802_11_ssid *pssid, u8 *da, u8 ch, bool append_wps,
- int try_cnt, int wait_ms)
+ int try_cnt, int wait_ms)
{
int ret;
int i = 0;
@@ -2894,8 +2894,8 @@ void issue_assocreq(struct adapter *padapter)
switch (pIE->element_id) {
case WLAN_EID_VENDOR_SPECIFIC:
if ((!memcmp(pIE->data, RTW_WPA_OUI, 4)) ||
- (!memcmp(pIE->data, WMM_OUI, 4)) ||
- (!memcmp(pIE->data, WPS_OUI, 4))) {
+ (!memcmp(pIE->data, WMM_OUI, 4)) ||
+ (!memcmp(pIE->data, WPS_OUI, 4))) {
vs_ie_length = pIE->length;
if ((!padapter->registrypriv.wifi_spec) && (!memcmp(pIE->data, WPS_OUI, 4))) {
/* Commented by Kurt 20110629
@@ -3267,7 +3267,7 @@ int issue_deauth(struct adapter *padapter, unsigned char *da, unsigned short rea
}
int issue_deauth_ex(struct adapter *padapter, u8 *da, unsigned short reason, int try_cnt,
- int wait_ms)
+ int wait_ms)
{
int ret;
int i = 0;
@@ -4161,7 +4161,7 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
/* Adjust channel plan by AP Country IE */
if (pregistrypriv->enable80211d &&
- (!pmlmeext->update_channel_plan_by_ap_done)) {
+ (!pmlmeext->update_channel_plan_by_ap_done)) {
u8 *ie, *p;
u32 len;
struct rt_channel_plan chplan_ap;
@@ -4211,8 +4211,8 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
if (pregistrypriv->wireless_mode & WIRELESS_11G) {
do {
if ((i == MAX_CHANNEL_NUM) ||
- (chplan_sta[i].channel_num == 0) ||
- (chplan_sta[i].channel_num > 14))
+ (chplan_sta[i].channel_num == 0) ||
+ (chplan_sta[i].channel_num > 14))
break;
if ((j == chplan_ap.Len) || (chplan_ap.Channel[j] > 14))
@@ -4239,8 +4239,8 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
/* change AP not support channel to Passive scan */
while ((i < MAX_CHANNEL_NUM) &&
- (chplan_sta[i].channel_num != 0) &&
- (chplan_sta[i].channel_num <= 14)) {
+ (chplan_sta[i].channel_num != 0) &&
+ (chplan_sta[i].channel_num <= 14)) {
chplan_new[k].channel_num = chplan_sta[i].channel_num;
chplan_new[k].scan_type = SCAN_PASSIVE;
i++;
@@ -4257,8 +4257,8 @@ static void process_80211d(struct adapter *padapter, struct wlan_bssid_ex *bssid
} else {
/* keep original STA 2.4G channel plan */
while ((i < MAX_CHANNEL_NUM) &&
- (chplan_sta[i].channel_num != 0) &&
- (chplan_sta[i].channel_num <= 14)) {
+ (chplan_sta[i].channel_num != 0) &&
+ (chplan_sta[i].channel_num <= 14)) {
chplan_new[k].channel_num = chplan_sta[i].channel_num;
chplan_new[k].scan_type = chplan_sta[i].scan_type;
i++;
@@ -5333,7 +5333,7 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned char *pbuf)
}
static int rtw_scan_ch_decision(struct adapter *padapter, struct rtw_ieee80211_channel *out,
- u32 out_num, struct rtw_ieee80211_channel *in, u32 in_num)
+ u32 out_num, struct rtw_ieee80211_channel *in, u32 in_num)
{
int i, j;
int set_idx;
@@ -5579,7 +5579,7 @@ u8 add_ba_hdl(struct adapter *padapter, unsigned char *pbuf)
return H2C_SUCCESS;
if (((pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) && (pmlmeinfo->HT_enable)) ||
- ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE)) {
+ ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE)) {
/* pmlmeinfo->ADDBA_retry_count = 0; */
/* pmlmeinfo->candidate_tid_bitmap |= (0x1 << pparm->tid); */
/* psta->htpriv.candidate_tid_bitmap |= BIT(pparm->tid); */
--
2.54.0
^ permalink raw reply related [flat|nested] 5+ messages in thread