From nobody Mon Feb 9 05:53:03 2026 Received: from out-183.mta1.migadu.com (out-183.mta1.migadu.com [95.215.58.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5321F34AB19 for ; Sun, 8 Feb 2026 11:01:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.183 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770548515; cv=none; b=DWjTV4uiHws2NSryXX4/9pKZRPOEAMuZI9Oof//IJo/fYqnxPtibWCGvTS1ogjh0GwzTOE7iiyRfDfUR1w9Wp3VltkUtgqpI4XPq0qvXp/28X8qcqwFVy9Vecr9Gk1RtiDHPYw+Ct80i1q3CRLPYCWWlhTl0ulzHgO347R+CmyY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770548515; c=relaxed/simple; bh=z9XAtCrvIlGYPYtMoQcHsVZjZyfrVVpzGrP3d+Bm3+o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d9NmQnqDsrWyZzKVE9CKVvWNkd0OLD0yUygK3zrTpQToj2WRq0bM65svwKESDX0Qh/WQ6aiN5RVwwJebxveAgVv0KwXxpGXCx57S3YlmmmGB4rBuGUvyvc/JoJeDEOuG1JAyYmvlFDWq5rHjsjfmJm4aOS7oB5y4rphV+IUnXvw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=AWx+OLeB; arc=none smtp.client-ip=95.215.58.183 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="AWx+OLeB" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1770548512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Vej7qKyyOe/4LKltSUUYftdzu8lwTOX3et1fcSF3nlo=; b=AWx+OLeBESKM5YBHHq9CEnnesLJR5MD6dq2ZKPd4T/0WK29NcECEBbQzMTf7Xujb2UafJh iL6nVSknodLsbmSK4LW0dgac7JZVaCR8aSySN/BVHUfaVBtchF30/MA/gB0LLaQJxtVehI XF2z4Jg8NV8NoR5MG2Qb4Up4SDw6piE= From: luka.gejak@linux.dev To: Greg Kroah-Hartman Cc: Dan Carpenter , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Luka Gejak Subject: [PATCH v3 18/22] staging: rtl8723bs: core: fix line lengths in rtw_cmd.c Date: Sun, 8 Feb 2026 12:01:07 +0100 Message-ID: <20260208110111.46642-19-luka.gejak@linux.dev> In-Reply-To: <20260208110111.46642-1-luka.gejak@linux.dev> References: <20260208110111.46642-1-luka.gejak@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: Luka Gejak Break long lines exceeding 100 characters to comply with kernel coding style. Signed-off-by: Luka Gejak --- drivers/staging/rtl8723bs/core/rtw_cmd.c | 147 +++++++++++++---------- 1 file changed, 81 insertions(+), 66 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index b2e7f479f72b..b2e34a6842fc 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -183,7 +183,7 @@ int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) return -ENOMEM; } =20 - pcmdpriv->rsp_buf =3D pcmdpriv->rsp_allocated_buf + 4 - ((SIZE_PTR)(pcmdp= riv->rsp_allocated_buf) & 3); + pcmdpriv->rsp_buf =3D PTR_ALIGN(pcmdpriv->rsp_allocated_buf, 4); =20 pcmdpriv->cmd_issued_cnt =3D 0; pcmdpriv->cmd_done_cnt =3D 0; @@ -392,7 +392,7 @@ int rtw_cmd_thread(void *context) while (1) { if (wait_for_completion_interruptible(&pcmdpriv->cmd_queue_comp)) { netdev_dbg(padapter->pnetdev, - FUNC_ADPT_FMT " wait_for_completion_interruptible(&pcmdpriv->cmd_qu= eue_comp) return !=3D 0, break\n", + FUNC_ADPT_FMT " cmd_queue_comp interrupted\n", FUNC_ADPT_ARG(padapter)); break; } @@ -726,31 +726,33 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct = wlan_network *pnetwork) memcpy(&psecuritypriv->authenticator_ie[1], &psecnetwork->ies[12], (256 = - 1)); =20 psecnetwork->ie_length =3D 0; - /* Added by Albert 2009/02/18 */ - /* If the driver wants to use the bssid to create the connection. */ - /* If not, we have to copy the connecting AP's MAC address to it so tha= t */ - /* the driver just has the bssid information for PMKIDList searching. */ =20 + /* If not using bssid, copy connecting AP's MAC for PMKIDList searching. = */ if (!pmlmepriv->assoc_by_bssid) - memcpy(&pmlmepriv->assoc_bssid[0], &pnetwork->network.mac_address[0], ET= H_ALEN); + memcpy(pmlmepriv->assoc_bssid, pnetwork->network.mac_address, ETH_ALEN); =20 - psecnetwork->ie_length =3D rtw_restruct_sec_ie(padapter, &pnetwork->netwo= rk.ies[0], &psecnetwork->ies[0], pnetwork->network.ie_length); - - pqospriv->qos_option =3D 0; - - if (pregistrypriv->wmm_enable) { - tmp_len =3D rtw_restruct_wmm_ie(padapter, &pnetwork->network.ies[0], &ps= ecnetwork->ies[0], pnetwork->network.ie_length, psecnetwork->ie_length); - - if (psecnetwork->ie_length !=3D tmp_len) { - psecnetwork->ie_length =3D tmp_len; - pqospriv->qos_option =3D 1; /* There is WMM IE in this corresp. beacon = */ - } else { - pqospriv->qos_option =3D 0;/* There is no WMM IE in this corresp. beaco= n */ + { + u8 *src_ie =3D pnetwork->network.ies; + u8 *dst_ie =3D psecnetwork->ies; + int src_len =3D pnetwork->network.ie_length; + + psecnetwork->ie_length =3D rtw_restruct_sec_ie(padapter, src_ie, + dst_ie, src_len); + + pqospriv->qos_option =3D 0; + if (pregistrypriv->wmm_enable) { + tmp_len =3D rtw_restruct_wmm_ie(padapter, src_ie, dst_ie, + src_len, psecnetwork->ie_length); + if (psecnetwork->ie_length !=3D tmp_len) { + psecnetwork->ie_length =3D tmp_len; + pqospriv->qos_option =3D 1; + } } - } =20 - phtpriv->ht_option =3D false; - ptmp =3D rtw_get_ie(&pnetwork->network.ies[12], WLAN_EID_HT_CAPABILITY, &= tmp_len, pnetwork->network.ie_length - 12); + phtpriv->ht_option =3D false; + ptmp =3D rtw_get_ie(&src_ie[12], WLAN_EID_HT_CAPABILITY, + &tmp_len, src_len - 12); + } if (pregistrypriv->ht_enable && ptmp && tmp_len > 0) { /* Added by Albert 2010/06/23 */ /* For the WEP mode, we will use the bg mode to do the connection to avo= id some IOT issue. */ @@ -787,7 +789,8 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wl= an_network *pnetwork) return res; } =20 -u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool = enqueue) /* for sta_mode */ +/* for sta_mode */ +u8 rtw_disassoc_cmd(struct adapter *padapter, u32 deauth_timeout_ms, bool = enqueue) { struct cmd_obj *cmdobj =3D NULL; struct disconnect_parm *param =3D NULL; @@ -823,10 +826,12 @@ u8 rtw_disassoc_cmd(struct adapter *padapter, u32 dea= uth_timeout_ms, bool enqueu return res; } =20 -u8 rtw_setopmode_cmd(struct adapter *padapter, enum ndis_802_11_network_i= nfrastructure 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; + struct cmd_obj *ph2c; + struct setopmode_parm *psetop; =20 struct cmd_priv *pcmdpriv =3D &padapter->cmdpriv; u8 res =3D _SUCCESS; @@ -879,10 +884,14 @@ u8 rtw_setstakey_cmd(struct adapter *padapter, struct= sta_info *sta, u8 unicast_ else GET_ENCRY_ALGO(psecuritypriv, sta, psetstakey_para->algorithm, false); =20 - if (unicast_key) + if (unicast_key) { memcpy(&psetstakey_para->key, &sta->dot118021x_UncstKey, 16); - else - memcpy(&psetstakey_para->key, &psecuritypriv->dot118021XGrpKey[psecurity= priv->dot118021XGrpKeyid].skey, 16); + } else { + u8 keyid =3D psecuritypriv->dot118021XGrpKeyid; + u8 *grpkey =3D psecuritypriv->dot118021XGrpKey[keyid].skey; + + memcpy(&psetstakey_para->key, grpkey, 16); + } =20 /* jeff: set this because at least sw key is ready */ padapter->securitypriv.busetkipkey =3D true; @@ -1104,25 +1113,26 @@ u8 rtw_dynamic_chk_wk_cmd(struct adapter *padapter) static void collect_traffic_statistics(struct adapter *padapter) { struct dvobj_priv *pdvobjpriv =3D adapter_to_dvobj(padapter); - - /* Tx */ - pdvobjpriv->traffic_stat.tx_bytes =3D padapter->xmitpriv.tx_bytes; - pdvobjpriv->traffic_stat.tx_pkts =3D padapter->xmitpriv.tx_pkts; - pdvobjpriv->traffic_stat.tx_drop =3D padapter->xmitpriv.tx_drop; - - /* Rx */ - pdvobjpriv->traffic_stat.rx_bytes =3D padapter->recvpriv.rx_bytes; - pdvobjpriv->traffic_stat.rx_pkts =3D padapter->recvpriv.rx_pkts; - pdvobjpriv->traffic_stat.rx_drop =3D padapter->recvpriv.rx_drop; - - /* Calculate throughput in last interval */ - pdvobjpriv->traffic_stat.cur_tx_bytes =3D pdvobjpriv->traffic_stat.tx_byt= es - pdvobjpriv->traffic_stat.last_tx_bytes; - pdvobjpriv->traffic_stat.cur_rx_bytes =3D pdvobjpriv->traffic_stat.rx_byt= es - pdvobjpriv->traffic_stat.last_rx_bytes; - pdvobjpriv->traffic_stat.last_tx_bytes =3D pdvobjpriv->traffic_stat.tx_by= tes; - pdvobjpriv->traffic_stat.last_rx_bytes =3D pdvobjpriv->traffic_stat.rx_by= tes; - - pdvobjpriv->traffic_stat.cur_tx_tp =3D (u32)(pdvobjpriv->traffic_stat.cur= _tx_bytes * 8 / 2 / 1024 / 1024); - pdvobjpriv->traffic_stat.cur_rx_tp =3D (u32)(pdvobjpriv->traffic_stat.cur= _rx_bytes * 8 / 2 / 1024 / 1024); + struct rtw_traffic_statistics *stats =3D &pdvobjpriv->traffic_stat; + + /* Tx */ + stats->tx_bytes =3D padapter->xmitpriv.tx_bytes; + stats->tx_pkts =3D padapter->xmitpriv.tx_pkts; + stats->tx_drop =3D padapter->xmitpriv.tx_drop; + + /* Rx */ + stats->rx_bytes =3D padapter->recvpriv.rx_bytes; + stats->rx_pkts =3D padapter->recvpriv.rx_pkts; + stats->rx_drop =3D padapter->recvpriv.rx_drop; + + /* Calculate throughput in last interval */ + stats->cur_tx_bytes =3D stats->tx_bytes - stats->last_tx_bytes; + stats->cur_rx_bytes =3D stats->rx_bytes - stats->last_rx_bytes; + stats->last_tx_bytes =3D stats->tx_bytes; + stats->last_rx_bytes =3D stats->rx_bytes; + + stats->cur_tx_tp =3D (u32)(stats->cur_tx_bytes * 8 / 2 / 1024 / 1024); + stats->cur_rx_tp =3D (u32)(stats->cur_rx_bytes * 8 / 2 / 1024 / 1024); } =20 u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer) @@ -1168,27 +1178,31 @@ u8 traffic_status_watchdog(struct adapter *padapter= , u8 from_timer) } =20 /* check traffic for powersaving. */ - if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->Link= DetectInfo.NumTxOkInPeriod) > 8) || - (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2)) { - bEnterPS =3D false; + { + struct rt_link_detect_t *ldi =3D &pmlmepriv->LinkDetectInfo; + u32 rx_tx_sum =3D ldi->NumRxUnicastOkInPeriod + ldi->NumTxOkInPeriod; =20 - if (bBusyTraffic) { - if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount <=3D 4) - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 4; + if ((rx_tx_sum > 8) || (ldi->NumRxUnicastOkInPeriod > 2)) { + bEnterPS =3D false; =20 - pmlmepriv->LinkDetectInfo.TrafficTransitionCount++; + if (bBusyTraffic) { + if (ldi->TrafficTransitionCount <=3D 4) + ldi->TrafficTransitionCount =3D 4; =20 - if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount > 30/*TrafficTran= sitionLevel*/) - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 30; - } - } else { - if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount >=3D 2) - pmlmepriv->LinkDetectInfo.TrafficTransitionCount -=3D 2; - else - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 0; + ldi->TrafficTransitionCount++; + + if (ldi->TrafficTransitionCount > 30) + ldi->TrafficTransitionCount =3D 30; + } + } else { + if (ldi->TrafficTransitionCount >=3D 2) + ldi->TrafficTransitionCount -=3D 2; + else + ldi->TrafficTransitionCount =3D 0; =20 - if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D=3D 0) - bEnterPS =3D true; + if (ldi->TrafficTransitionCount =3D=3D 0) + bEnterPS =3D true; + } } =20 /* LeisurePS only work in infra mode. */ @@ -1734,7 +1748,8 @@ u8 rtw_drvextra_cmd_hdl(struct adapter *padapter, uns= igned char *pbuf) pdrvextra_cmd =3D (struct drvextra_cmd_parm *)pbuf; =20 switch (pdrvextra_cmd->ec_id) { - case DYNAMIC_CHK_WK_CID:/* only primary padapter go to this cmd, but exe= cute dynamic_chk_wk_hdl() for two interfaces */ + /* only primary padapter goes to this cmd, but execute for two interfaces= */ + case DYNAMIC_CHK_WK_CID: dynamic_chk_wk_hdl(padapter); break; case POWER_SAVING_CTRL_WK_CID: --=20 2.52.0