From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61FAA2D0C62 for ; Sat, 18 Apr 2026 16:47:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776530857; cv=none; b=lP1rAFwY6fotcStVVMl8KxMQvVNKFs9OlCaptegpLuM468Jy3DaJumYPvrdg7bwBg8fzmIB7EjQ7znJIhq96b3sUHEMRAZCzmQ/PWxtdEL1VCpg9as4Hsp/MHaITrFr36SpcBZ60RH+FkCVhEkIq9vM+aIA2sBWUH8e6gLrJAmE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776530857; c=relaxed/simple; bh=tmJT43AypjjE6e5vBKmblh07+ro1Vm9Ao5OiiIoAHMo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=AjETSd/SruSI3601eB0DLdS7/0OmjwFMLpsQzKaRXyjqHxGg/A9i0XhTraxy9kseVhUm2fFRoTy4Ut8xaFTDq5mA6jUJs49cP5a7rg5q1V3jLQdk8P6exWIADSG4inr9KcDlhcWgy++vt0cI7mDc7SL4cRP0o3AXopFrmMAhFSc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=crimson.net.eu.org; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=crimson.net.eu.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-48374014a77so20582255e9.3 for ; Sat, 18 Apr 2026 09:47:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776530853; x=1777135653; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=PosRtc72mrCXOGf7Y0BHBJl8eUZQ01weq4M+FpaeyGA=; b=cDAIACVjTWeqrpCyRlDM1ISsyYJGxspi7fihnhjHCjmmlyCnM8zotGY4cssPZFi//L DgMocOUaXDTz3VDKJjgtmpSbQ60GfPMBodA5EHS8V519guJ8LUDCeHDLO+7SNxRtIhTW A19JTqysMdEXu4dwN+LWgLxXWg43e7RARgibEFPYzLMv6Hhj9iENXLjFqynyUEnUlRIP MgeZ7EQDyjUoy1BaUfckKzQrRVxDUFppAYL7VpDq49SAM+uCDi6mN6f8/tnQe+xjAUcx AaSpLSKAfPoVqbLgaG42kPqgR8KJm4Y0ji22oL+2kU/WqXP+IYVlRkuKWD5taj/aEWee D4Tg== X-Forwarded-Encrypted: i=1; AFNElJ92JZNUUpylYPnEjditzkFRS73191xDnwn5yeDnjhePgzoRHHAVpkgjEFsfmrUhFk+BCRevjIh22bJu2F0=@vger.kernel.org X-Gm-Message-State: AOJu0YwOg5ymExGsFM5Q56sBFg/hoyCfy4aHxsicvAh+3n1Mnor0BBos LL/6D6dDijl54xjiSp2QgieYVjojs+g/UxGmSZ7E1DeKUM+tVMW6ZddY X-Gm-Gg: AeBDievFnXmybO3fHLCGuyquL4slYoRFeCTZnyq+rWh+xpaul+wa/94g9uapsqDwibE 5jSiIhH/GVUNKi4K6W7ksmDVUFzDMcfktW2Lnv1Jt2OSd6YOYlCpeozxXq9Dw0e5BukJOHEz126 TL/2RWjhlvU4O3rRD/Tq7TA4gZLTAN+lcVKyTykRAzOhj0PyuGOtt6/dwfGjtzO5Txs4Dwv1qkU uC61C5rTGZzFcCf3QzOqvUr0whP1ATGxHwip8FAUPcMvRvsZVrYAgPqzHzp4h/FjIpkfXPy208L mxImbWsULyH0KJHmvWKYsm1pDdqptYGoksou4wkYMxnDO9cFKwuSqWPPEFwEjXoc9r9TiCHutuH JVaNRJTbBcF0EgaAEdvwyKTKR3nxE96p92Oz8OXxc/PCqqLSayyZLscGVcwXYc9DSkKDiDzzcFU iQM9tChjOUjOde6DDujeJvVg4IrB2yT9rkRTx7f+SxZso+19ORc7vS9DHgciX5dOdWMQhYyIOCv umITRc1ir4117SND732FTPgZWthoxnurjHtmFyYG+a1 X-Received: by 2002:a05:600c:c0c8:b0:487:21c7:2885 with SMTP id 5b1f17b1804b1-488fb73d9ffmr81681675e9.5.1776530852586; Sat, 18 Apr 2026 09:47:32 -0700 (PDT) Received: from localhost.localdomain ([151.41.34.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488fb7bd700sm44349075e9.31.2026.04.18.09.47.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Apr 2026 09:47:32 -0700 (PDT) From: deep@crimson.net.eu.org To: Greg Kroah-Hartman Cc: Dan Carpenter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Kenet Jovan Sokoli Subject: [PATCH] staging: rtl8723bs: refactor code flow and fix sleep ranges Date: Sat, 18 Apr 2026 18:47:19 +0200 Message-ID: <20260418164719.1069618-1-deep@crimson.net.eu.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Kenet Jovan Sokoli Clean up core files to improve readability and style compliance - Flatten deeply nested if-statements mainly in rtw_security.c. - Correct usleep_range() arguments where min > max. - Improve code flow and readability by using early returns/breaks. Signed-off-by: Kenet Jovan Sokoli --- some if statements still give warnings when checked with checkpatch.pl. I thought about removing them entirely since they're currently blank, but decided against it. If it is necessary to revert them or delete them, please let me know. --- drivers/staging/rtl8723bs/core/rtw_cmd.c | 3 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 8 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 3 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 6 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 10 +- drivers/staging/rtl8723bs/core/rtw_security.c | 120 +++++++++--------- drivers/staging/rtl8723bs/core/rtw_xmit.c | 3 +- 7 files changed, 77 insertions(+), 76 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c index abb84f8aecbe..439591608c84 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -8,6 +8,7 @@ #include #include #include +#include static struct _cmd_callback rtw_cmd_callback[] = { {GEN_CMD_CODE(_Read_MACREG), NULL}, /*0*/ @@ -214,7 +215,7 @@ void _rtw_free_evt_priv(struct evt_priv *pevtpriv) { _cancel_workitem_sync(&pevtpriv->c2h_wk); while (pevtpriv->c2h_wk_alive) - msleep(10); + usleep_range(10000, 11000); while (!rtw_cbuf_empty(pevtpriv->c2h_queue)) { void *c2h = rtw_cbuf_pop(pevtpriv->c2h_queue); diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 1ef48bf6581c..dd9d6af127ab 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -501,7 +501,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t } if (rtw_roam_flags(adapter)) { - /* TODO: don't select network in the same ess as oldest if it's new enough*/ + /* TODO: don't select network in the same ess as oldest if it's new enough */ } if (!oldest || time_after(oldest->last_scanned, pnetwork->last_scanned)) @@ -1195,10 +1195,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) rtw_free_stainfo(adapter, pcur_sta); ptarget_wlan = rtw_find_network(&pmlmepriv->scanned_queue, pnetwork->network.mac_address); - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { - if (ptarget_wlan) - ptarget_wlan->fixed = true; - } + if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && ptarget_wlan) + ptarget_wlan->fixed = true; } } else { diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index b1f20aa81efb..53bc015c0deb 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -9,6 +9,7 @@ #include #include #include +#include static struct mlme_handler mlme_sta_tbl[] = { {WIFI_ASSOCREQ, "OnAssocReq", &OnAssocReq}, @@ -5833,7 +5834,7 @@ u8 chk_bmc_sleepq_hdl(struct adapter *padapter, unsigned char *pbuf) return H2C_SUCCESS; if ((pstapriv->tim_bitmap & BIT(0)) && (psta_bmc->sleepq_len > 0)) { - msleep(10);/* 10ms, ATIM(HIQ) Windows */ + usleep_range(10000, 11000);/* 10ms, ATIM(HIQ) Windows */ /* spin_lock_bh(&psta_bmc->sleep_q.lock); */ spin_lock_bh(&pxmitpriv->lock); diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c index 1c9e02732687..e78f80f9d3b5 100644 --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c @@ -7,6 +7,7 @@ #include #include #include +#include void _ips_enter(struct adapter *padapter) { @@ -420,7 +421,7 @@ s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms) err = -1; break; } - msleep(1); + usleep_range(1000, 2000); } return err; @@ -571,7 +572,7 @@ void LPS_Leave_check(struct adapter *padapter) if (jiffies_to_msecs(jiffies - start_time) > 100) break; - msleep(1); + usleep_range(1000, 2000); } } @@ -991,6 +992,7 @@ void rtw_free_pwrctrl_priv(struct adapter *adapter) inline void rtw_set_ips_deny(struct adapter *padapter, u32 ms) { struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); + pwrpriv->ips_deny_time = jiffies + msecs_to_jiffies(ms); } diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c index 337671b1211f..a83d60dbd3ea 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -1339,11 +1339,10 @@ static signed int validate_recv_data_frame(struct adapter *adapter, union recv_f } - if (ret == _FAIL) { + if (ret == _FAIL) goto exit; - } else if (ret == RTW_RX_HANDLED) { + else if (ret == RTW_RX_HANDLED) goto exit; - } if (!psta) { @@ -1593,7 +1592,7 @@ static signed int wlanhdr_to_ethhdr(union recv_frame *precvframe) eth_type = ntohs(be_tmp); /* pattrib->ether_type */ pattrib->eth_type = eth_type; - if ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)) { + if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == true) { ptr += rmv_len; *ptr = 0x87; *(ptr+1) = 0x12; @@ -1837,8 +1836,7 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, un /* Duplicate entry is found!! Do not insert current entry. */ /* spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */ return false; - else - break; + break; } diff --git a/drivers/staging/rtl8723bs/core/rtw_security.c b/drivers/staging/rtl8723bs/core/rtw_security.c index b489babe7432..084dda858582 100644 --- a/drivers/staging/rtl8723bs/core/rtw_security.c +++ b/drivers/staging/rtl8723bs/core/rtw_security.c @@ -521,82 +521,82 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe) pframe = (unsigned char *)((union recv_frame *)precvframe)->u.hdr.rx_data; /* 4 start to decrypt recvframe */ - if (prxattrib->encrypt == _TKIP_) { - stainfo = rtw_get_stainfo(&padapter->stapriv, &prxattrib->ta[0]); - if (stainfo) { - if (is_multicast_ether_addr(prxattrib->ra)) { - static unsigned long start; - static u32 no_gkey_bc_cnt; - static u32 no_gkey_mc_cnt; + if (prxattrib->encrypt != _TKIP_) + goto exit; - if (!psecuritypriv->binstallGrpkey) { - res = _FAIL; + stainfo = rtw_get_stainfo(&padapter->stapriv, &prxattrib->ta[0]); + if (!stainfo) { + res = _FAIL; + goto exit; + } - if (start == 0) - start = jiffies; + if (is_multicast_ether_addr(prxattrib->ra)) { + static unsigned long start; + static u32 no_gkey_bc_cnt; + static u32 no_gkey_mc_cnt; - if (is_broadcast_mac_addr(prxattrib->ra)) - no_gkey_bc_cnt++; - else - no_gkey_mc_cnt++; + if (!psecuritypriv->binstallGrpkey) { + res = _FAIL; - if (jiffies_to_msecs(jiffies - start) > 1000) { - if (no_gkey_bc_cnt || no_gkey_mc_cnt) { - netdev_dbg(padapter->pnetdev, - FUNC_ADPT_FMT " no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n", - FUNC_ADPT_ARG(padapter), - no_gkey_bc_cnt, - no_gkey_mc_cnt); - } - start = jiffies; - no_gkey_bc_cnt = 0; - no_gkey_mc_cnt = 0; - } - goto exit; - } + if (start == 0) + start = jiffies; - if (no_gkey_bc_cnt || no_gkey_mc_cnt) { - netdev_dbg(padapter->pnetdev, - FUNC_ADPT_FMT " gkey installed. no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n", - FUNC_ADPT_ARG(padapter), - no_gkey_bc_cnt, - no_gkey_mc_cnt); - } - start = 0; + if (is_broadcast_mac_addr(prxattrib->ra)) + no_gkey_bc_cnt++; + else + no_gkey_mc_cnt++; + + if (jiffies_to_msecs(jiffies - start) > 1000 && (no_gkey_bc_cnt || no_gkey_mc_cnt)) { + netdev_dbg(padapter->pnetdev, + FUNC_ADPT_FMT " no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n", + FUNC_ADPT_ARG(padapter), + no_gkey_bc_cnt, + no_gkey_mc_cnt); + start = jiffies; no_gkey_bc_cnt = 0; no_gkey_mc_cnt = 0; - - prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; - } else { - prwskey = &stainfo->dot118021x_UncstKey.skey[0]; } + goto exit; + } - iv = pframe + prxattrib->hdrlen; - payload = pframe + prxattrib->iv_len + prxattrib->hdrlen; - length = ((union recv_frame *)precvframe)->u.hdr.len - prxattrib->hdrlen - prxattrib->iv_len; + if (no_gkey_bc_cnt || no_gkey_mc_cnt) { + netdev_dbg(padapter->pnetdev, + FUNC_ADPT_FMT " gkey installed. no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n", + FUNC_ADPT_ARG(padapter), + no_gkey_bc_cnt, + no_gkey_mc_cnt); + } + start = 0; + no_gkey_bc_cnt = 0; + no_gkey_mc_cnt = 0; - GET_TKIP_PN(iv, dot11txpn); + prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; + } else { + prwskey = &stainfo->dot118021x_UncstKey.skey[0]; + } - pnl = (u16)(dot11txpn.val); - pnh = (u32)(dot11txpn.val >> 16); + iv = pframe + prxattrib->hdrlen; + payload = pframe + prxattrib->iv_len + prxattrib->hdrlen; + length = ((union recv_frame *)precvframe)->u.hdr.len - prxattrib->hdrlen - prxattrib->iv_len; - phase1((u16 *)&ttkey[0], prwskey, &prxattrib->ta[0], pnh); - phase2(&rc4key[0], prwskey, (unsigned short *)&ttkey[0], pnl); + GET_TKIP_PN(iv, dot11txpn); - /* 4 decrypt payload include icv */ + pnl = (u16)(dot11txpn.val); + pnh = (u32)(dot11txpn.val >> 16); - arc4_setkey(ctx, rc4key, 16); - arc4_crypt(ctx, payload, payload, length); + phase1((u16 *)&ttkey[0], prwskey, &prxattrib->ta[0], pnh); + phase2(&rc4key[0], prwskey, (unsigned short *)&ttkey[0], pnl); - *((u32 *)crc) = ~crc32_le(~0, payload, length - 4); + /* 4 decrypt payload include icv */ - if (crc[3] != payload[length - 1] || crc[2] != payload[length - 2] || - crc[1] != payload[length - 3] || crc[0] != payload[length - 4]) - res = _FAIL; - } else { - res = _FAIL; - } - } + arc4_setkey(ctx, rc4key, 16); + arc4_crypt(ctx, payload, payload, length); + + *((u32 *)crc) = ~crc32_le(~0, payload, length - 4); + + if (crc[3] != payload[length - 1] || crc[2] != payload[length - 2] || + crc[1] != payload[length - 3] || crc[0] != payload[length - 4]) + res = _FAIL; exit: return res; } diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index 7b18be8912e6..1904b9162262 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -5,6 +5,7 @@ * ******************************************************************************/ #include +#include static u8 P802_1H_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0xf8 }; static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 }; @@ -128,7 +129,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter) /* Tx buf allocation may fail sometimes, so sleep and retry. */ res = rtw_os_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ), true); if (res == _FAIL) { - msleep(10); + usleep_range(10000, 11000); res = rtw_os_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ), true); if (res == _FAIL) goto exit; -- 2.43.0