From nobody Sat Feb 7 17:09:49 2026 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 C409825F988 for ; Fri, 16 Jan 2026 05:31:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768541484; cv=none; b=ViHHaUupu4RBEQT2otpBZlHZasCxAoLpfEsqUqpLOCVJGeEcsAjcqJ46NEvpZSA3+VGYU1T07aX0AwKFJaK6snXw2jKh+zluTeD82NqEFxerj+3iqlouGIoG7SZLDdhB4coybd6y0rqYok8d78QxnATgw2tnX7a9wGLEjFUmjDQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768541484; c=relaxed/simple; bh=LxAFQ/PuS51/b2fdXorHZqmZszJfXIjHKDO11JupKSc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CkJoTRV8gNCw95nqqIZS3ArPUvy7GIAQdOwgLnGybc2ZF+TgvWCiKgcsvvu83jNAA4cc9nLblTSPPrTQts/vHG+H8qQnPX406PNyM7ftFie5lbRVEH5u7SZKGTQz2HBOcMEhcvCr4ygNmEpgnlPAZE2p7Vc82vtKcZTGRtvaKuk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RgBVtX56; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RgBVtX56" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-34c708702dfso848842a91.1 for ; Thu, 15 Jan 2026 21:31:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768541482; x=1769146282; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GSJnTVssl9yM7jTQ7fA+3wPh5JaxbcwXiyjgA89qwC8=; b=RgBVtX56Km7SuqFEEk06EkymFBMsQBc35ouv1nT6kKKJVbduHLx/dCfQ0S4TCEMPa8 YLZfM4PKs+j+XbgLK+D7jOJBWUH789+AFlQjiAvj6u3UgBmnKpw+MuyEjhk8sDQ2eKV3 qB8/hpi9v7C1KhwbXMQd7UjqdEGfITA54mApX9UWWYjLE5s+T9pkWtSIIQeH0N8XijhI Nd2g0/7aPs/zu+tYt/f0cPxyNkOLCrhZTIIy1W/ApijWtBkD/KQpvt9Ha672l9llSxVD 9G8c7PmtAgo4SlgGyZA15gfJ7GZuiRAtnfiK7KneoIfb9ES3KpuEV26HNp/kw0hYN05W Js+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768541482; x=1769146282; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=GSJnTVssl9yM7jTQ7fA+3wPh5JaxbcwXiyjgA89qwC8=; b=TChBpwQw4Uu93TfsHVMEWpvOBBXgsy1lqM08MEKFDjf/MDitLhElLB9p/lO+mYDgHY 9CevLTV0NxYv+EyWy9H8hWkMzsvABaQtnE5Y0P5PGUoW51N/2YGPBnH2hAbL+tVI3dQJ IOhMnpgw33WzhLMZ+yuh/6aqkXM7HmvcWANXUMaDM+SvrIa8kf+PtR264nx2/FvDaR1O lsQLc8PZQ3mH+wPrd034KIdLc4bSEr2T3p5X0LEkkRj6HnvPQ8c74sCe2G6HQ0SuOS0+ nen17XNVNEHDtdUjKMFSj3+G4SEVHdFMAukz8FRdI83s88tbpy+LOvJ54x9N5zR8Aj3z PfCw== X-Forwarded-Encrypted: i=1; AJvYcCX9djTFhpROxjy+NzwWdEarKFvjDThS/VpkqUer2hQchreuOf13Pdx3jsk0jmsizRFBZPgg2TAd9JagfWo=@vger.kernel.org X-Gm-Message-State: AOJu0Yy4OGxFgCza1fvx0tOrGngpMetnQwVEWXHSs4+AcWEEdDP9bghH BvjqGgaqHczl71d1divO7TVXeUl/CEwMRGVPfdnrOAfCHUY2zOIQFOgW X-Gm-Gg: AY/fxX7LxSPrEtkZZmTFczDssjKmok06YeSxR49cOeq6vIe1mwwq25Pp75VamTmMiNa tCSV/ZilT/4TS2j0YV+/Nb9AQYNWR8fvOGdmN66V8eaqGDYs+GcAwBEQEWp6LrrvO9rGvRIWvBh I8B2BEwpIFjTYsw6xzwvLX0+Q56tW8S90IW1DQa0kduMHeUaVez0uRrolqoWKCoSyxeKq0m4XVK YPCV6FPq+WW8DELLxy9qxqZjoJgtzczAkrMpkPMdlCL1SFyQtENzoE6br+ilabQZJwdiw6wdGs6 3mj3b3WGy3E4Rmi6go9QjNojClyIZHZfUco8gnhoS/ZoZ2wBCSi7anRjMRetIJjrKlYFpKovjHI EfjRcoEAUwjPW4mc+c2WgYI0ym1cUQaYe4mYSSfSBTOEZUAmniwal1K4naoCRW2qaRIGHgPnQyE cRX3hjg/AwG/6qAv+6Ow== X-Received: by 2002:a17:90b:5603:b0:340:2a16:94be with SMTP id 98e67ed59e1d1-35272ef6716mr1407280a91.4.1768541482009; Thu, 15 Jan 2026 21:31:22 -0800 (PST) Received: from snowman ([2401:4900:4ffd:9a9f:7003:5e9c:3fa9:4130]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35274445a03sm297321a91.7.2026.01.15.21.31.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 21:31:21 -0800 (PST) From: Khushal Chitturi To: gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, straube.linux@gmail.com, hansg@kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Khushal Chitturi Subject: [PATCH v3 1/4] staging: rtl8723bs: fix operator and type cast spacing Date: Fri, 16 Jan 2026 11:00:49 +0530 Message-ID: <20260116053052.4198-2-khushalchitturi@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260116053052.4198-1-khushalchitturi@gmail.com> References: <20260116053052.4198-1-khushalchitturi@gmail.com> 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 Content-Type: text/plain; charset="utf-8" Fix spacing around operators and type casts in rtw_xmit.c to comply with the kernel coding style. Signed-off-by: Khushal Chitturi --- Changelog: v2 -> v3: Resubmitting as versioned series. v1 -> v2: No changes. drivers/staging/rtl8723bs/core/rtw_xmit.c | 89 +++++++++++++---------- 1 file changed, 50 insertions(+), 39 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index 21690857fd62..bbc42db1c828 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -78,7 +78,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, stru= ct adapter *padapter) } pxmitpriv->pxmit_frame_buf =3D (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pxmitpriv= ->pallocated_frame_buf), 4); =20 - pxframe =3D (struct xmit_frame *) pxmitpriv->pxmit_frame_buf; + pxframe =3D (struct xmit_frame *)pxmitpriv->pxmit_frame_buf; =20 for (i =3D 0; i < NR_XMITFRAME; i++) { INIT_LIST_HEAD(&pxframe->list); @@ -238,7 +238,9 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) pxmitbuf->padapter =3D padapter; pxmitbuf->buf_tag =3D XMITBUF_CMD; =20 - res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, MAX_CMDBUF_SZ+XM= ITBUF_ALIGN_SZ, true); + res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, + MAX_CMDBUF_SZ + XMITBUF_ALIGN_SZ, + true); if (res =3D=3D _FAIL) { res =3D _FAIL; goto exit; @@ -248,7 +250,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) pxmitbuf->pend =3D pxmitbuf->pbuf + MAX_CMDBUF_SZ; pxmitbuf->len =3D 0; pxmitbuf->pdata =3D pxmitbuf->ptail =3D pxmitbuf->phead; - pxmitbuf->alloc_sz =3D MAX_CMDBUF_SZ+XMITBUF_ALIGN_SZ; + pxmitbuf->alloc_sz =3D MAX_CMDBUF_SZ + XMITBUF_ALIGN_SZ; } } =20 @@ -274,7 +276,7 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) { int i; struct adapter *padapter =3D pxmitpriv->adapter; - struct xmit_frame *pxmitframe =3D (struct xmit_frame *) pxmitpriv->pxmit_= frame_buf; + struct xmit_frame *pxmitframe =3D (struct xmit_frame *)pxmitpriv->pxmit_f= rame_buf; struct xmit_buf *pxmitbuf =3D (struct xmit_buf *)pxmitpriv->pxmitbuf; =20 rtw_hal_free_xmit_priv(padapter); @@ -321,7 +323,9 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) for (i =3D 0; i < CMDBUF_MAX; i++) { pxmitbuf =3D &pxmitpriv->pcmd_xmitbuf[i]; if (pxmitbuf) - rtw_os_xmit_resource_free(padapter, pxmitbuf, MAX_CMDBUF_SZ+XMITBUF_ALI= GN_SZ, true); + rtw_os_xmit_resource_free(padapter, pxmitbuf, + MAX_CMDBUF_SZ + XMITBUF_ALIGN_SZ, + true); } =20 rtw_free_hwxmits(padapter); @@ -736,7 +740,7 @@ static s32 update_attrib(struct adapter *padapter, stru= ct sk_buff *pkt, struct p pattrib->subtype =3D WIFI_DATA_TYPE; pattrib->priority =3D 0; =20 - if (check_fwstate(pmlmepriv, WIFI_AP_STATE|WIFI_ADHOC_STATE|WIFI_ADHOC_MA= STER_STATE)) { + if (check_fwstate(pmlmepriv, WIFI_AP_STATE | WIFI_ADHOC_STATE | WIFI_ADHO= C_MASTER_STATE)) { if (pattrib->qos_en) set_qos(&pktfile, pattrib); } else { @@ -787,15 +791,15 @@ static s32 xmitframe_addmic(struct adapter *padapter,= struct xmit_frame *pxmitfr rtw_secmicsetkey(&micdata, &pattrib->dot11tkiptxmickey.skey[0]); } =20 - if (pframe[1]&1) { /* ToDS =3D=3D 1 */ + if (pframe[1] & 1) { /* ToDS =3D=3D 1 */ rtw_secmicappend(&micdata, &pframe[16], 6); /* DA */ - if (pframe[1]&2) /* From Ds =3D=3D 1 */ + if (pframe[1] & 2) /* From Ds =3D=3D 1 */ rtw_secmicappend(&micdata, &pframe[24], 6); else rtw_secmicappend(&micdata, &pframe[10], 6); } else { /* ToDS =3D=3D 0 */ rtw_secmicappend(&micdata, &pframe[4], 6); /* DA */ - if (pframe[1]&2) /* From Ds =3D=3D 1 */ + if (pframe[1] & 2) /* From Ds =3D=3D 1 */ rtw_secmicappend(&micdata, &pframe[16], 6); else rtw_secmicappend(&micdata, &pframe[10], 6); @@ -810,16 +814,20 @@ static s32 xmitframe_addmic(struct adapter *padapter,= struct xmit_frame *pxmitfr =20 for (curfragnum =3D 0; curfragnum < pattrib->nr_frags; curfragnum++) { payload =3D (u8 *)round_up((SIZE_PTR)(payload), 4); - payload =3D payload+pattrib->hdrlen+pattrib->iv_len; + payload =3D payload + pattrib->hdrlen + pattrib->iv_len; =20 - if ((curfragnum+1) =3D=3D pattrib->nr_frags) { - length =3D pattrib->last_txcmdsz-pattrib->hdrlen-pattrib->iv_len-((pa= ttrib->bswenc) ? pattrib->icv_len : 0); + if ((curfragnum + 1) =3D=3D pattrib->nr_frags) { + length =3D pattrib->last_txcmdsz - pattrib->hdrlen - + pattrib->iv_len - + ((pattrib->bswenc) ? pattrib->icv_len : 0); rtw_secmicappend(&micdata, payload, length); - payload =3D payload+length; + payload =3D payload + length; } else { - length =3D pxmitpriv->frag_len-pattrib->hdrlen-pattrib->iv_len-((patt= rib->bswenc) ? pattrib->icv_len : 0); + length =3D pxmitpriv->frag_len - pattrib->hdrlen - + pattrib->iv_len - + ((pattrib->bswenc) ? pattrib->icv_len : 0); rtw_secmicappend(&micdata, payload, length); - payload =3D payload+length+pattrib->icv_len; + payload =3D payload + length + pattrib->icv_len; } } rtw_secgetmic(&micdata, &mic[0]); @@ -1108,8 +1116,10 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter,= struct sk_buff *pkt, struct if (bmcst || (rtw_endofpktfile(&pktfile) =3D=3D true)) { pattrib->nr_frags =3D frg_inx; =20 - pattrib->last_txcmdsz =3D pattrib->hdrlen + pattrib->iv_len + ((pattrib= ->nr_frags =3D=3D 1) ? llc_sz:0) + - ((pattrib->bswenc) ? pattrib->icv_len : 0) + mem_sz; + pattrib->last_txcmdsz =3D pattrib->hdrlen + pattrib->iv_len + + ((pattrib->nr_frags =3D=3D 1) ? llc_sz : 0) + + ((pattrib->bswenc) ? pattrib->icv_len : 0) + + mem_sz; =20 ClearMFrag(mem_start); =20 @@ -1158,7 +1168,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padap= ter, struct sk_buff *pkt, s mem_start =3D pframe =3D (u8 *)(pxmitframe->buf_addr) + TXDESC_OFFSET; pwlanhdr =3D (struct ieee80211_hdr *)pframe; =20 - ori_len =3D BIP_AAD_SIZE+pattrib->pktlen; + ori_len =3D BIP_AAD_SIZE + pattrib->pktlen; tmp_buf =3D BIP_AAD =3D rtw_zmalloc(ori_len); subtype =3D GetFrameSubType(pframe); /* bit(7)~bit(2) */ =20 @@ -1211,14 +1221,14 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *pad= apter, struct sk_buff *pkt, s /* conscruct AAD, copy address 1 to address 3 */ memcpy(BIP_AAD + 2, &pwlanhdr->addrs, sizeof(pwlanhdr->addrs)); /* copy management fram body */ - memcpy(BIP_AAD+BIP_AAD_SIZE, MGMT_body, frame_body_len); + memcpy(BIP_AAD + BIP_AAD_SIZE, MGMT_body, frame_body_len); /* calculate mic */ if (omac1_aes_128(padapter->securitypriv.dot11wBIPKey[padapter->security= priv.dot11wBIPKeyid].skey - , BIP_AAD, BIP_AAD_SIZE+frame_body_len, mic)) + , BIP_AAD, BIP_AAD_SIZE + frame_body_len, mic)) goto xmitframe_coalesce_fail; =20 /* copy right BIP mic value, total is 128bits, we use the 0~63 bits */ - memcpy(pframe-8, mic, 8); + memcpy(pframe - 8, mic, 8); } else { /* unicast mgmt frame TX */ /* start to encrypt mgmt frame */ if (subtype =3D=3D WIFI_DEAUTH || subtype =3D=3D WIFI_DISASSOC || @@ -1267,9 +1277,10 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *pada= pter, struct sk_buff *pkt, s memcpy(pframe, pattrib->iv, pattrib->iv_len); pframe +=3D pattrib->iv_len; /* copy mgmt data portion after CCMP header */ - memcpy(pframe, tmp_buf+pattrib->hdrlen, pattrib->pktlen-pattrib->hdrlen= ); + memcpy(pframe, tmp_buf + pattrib->hdrlen, + pattrib->pktlen - pattrib->hdrlen); /* move pframe to end of mgmt pkt */ - pframe +=3D pattrib->pktlen-pattrib->hdrlen; + pframe +=3D pattrib->pktlen - pattrib->hdrlen; /* add 8 bytes CCMP IV header to length */ pattrib->pktlen +=3D pattrib->iv_len; if ((pattrib->icv_len > 0) && (pattrib->bswenc)) { @@ -1375,7 +1386,7 @@ void rtw_count_tx_stats(struct adapter *padapter, str= uct xmit_frame *pxmitframe, struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; u8 pkt_num =3D 1; =20 - if ((pxmitframe->frame_tag&0x0f) =3D=3D DATA_FRAMETAG) { + if ((pxmitframe->frame_tag & 0x0f) =3D=3D DATA_FRAMETAG) { pkt_num =3D pxmitframe->agg_num; =20 pmlmepriv->LinkDetectInfo.NumTxOkInPeriod +=3D pkt_num; @@ -2070,7 +2081,7 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct = adapter *padapter, struct x =20 spin_lock_bh(&psta->sleep_q.lock); =20 - if (psta->state&WIFI_SLEEP_STATE) { + if (psta->state & WIFI_SLEEP_STATE) { u8 wmmps_ac =3D 0; =20 if (pstapriv->sta_dz_bitmap & BIT(psta->aid)) { @@ -2083,20 +2094,20 @@ signed int xmitframe_enqueue_for_sleeping_sta(struc= t adapter *padapter, struct x switch (pattrib->priority) { case 1: case 2: - wmmps_ac =3D psta->uapsd_bk&BIT(0); + wmmps_ac =3D psta->uapsd_bk & BIT(0); break; case 4: case 5: - wmmps_ac =3D psta->uapsd_vi&BIT(0); + wmmps_ac =3D psta->uapsd_vi & BIT(0); break; case 6: case 7: - wmmps_ac =3D psta->uapsd_vo&BIT(0); + wmmps_ac =3D psta->uapsd_vo & BIT(0); break; case 0: case 3: default: - wmmps_ac =3D psta->uapsd_be&BIT(0); + wmmps_ac =3D psta->uapsd_be & BIT(0); break; } =20 @@ -2214,20 +2225,20 @@ void wakeup_sta_to_xmit(struct adapter *padapter, s= truct sta_info *psta) switch (pxmitframe->attrib.priority) { case 1: case 2: - wmmps_ac =3D psta->uapsd_bk&BIT(1); + wmmps_ac =3D psta->uapsd_bk & BIT(1); break; case 4: case 5: - wmmps_ac =3D psta->uapsd_vi&BIT(1); + wmmps_ac =3D psta->uapsd_vi & BIT(1); break; case 6: case 7: - wmmps_ac =3D psta->uapsd_vo&BIT(1); + wmmps_ac =3D psta->uapsd_vo & BIT(1); break; case 0: case 3: default: - wmmps_ac =3D psta->uapsd_be&BIT(1); + wmmps_ac =3D psta->uapsd_be & BIT(1); break; } =20 @@ -2259,7 +2270,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, str= uct sta_info *psta) =20 pstapriv->tim_bitmap &=3D ~BIT(psta->aid); =20 - if (psta->state&WIFI_SLEEP_STATE) + if (psta->state & WIFI_SLEEP_STATE) psta->state ^=3D WIFI_SLEEP_STATE; =20 if (psta->state & WIFI_STA_ALIVE_CHK_STATE) { @@ -2274,7 +2285,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, str= uct sta_info *psta) if (!psta_bmc) goto _exit; =20 - if ((pstapriv->sta_dz_bitmap&0xfffe) =3D=3D 0x0) { /* no any sta in ps mo= de */ + if ((pstapriv->sta_dz_bitmap & 0xfffe) =3D=3D 0x0) { /* no any sta in ps = mode */ xmitframe_phead =3D get_list_head(&psta_bmc->sleep_q); list_for_each_safe(xmitframe_plist, tmp, xmitframe_phead) { pxmitframe =3D list_entry(xmitframe_plist, @@ -2327,20 +2338,20 @@ void xmit_delivery_enabled_frames(struct adapter *p= adapter, struct sta_info *pst switch (pxmitframe->attrib.priority) { case 1: case 2: - wmmps_ac =3D psta->uapsd_bk&BIT(1); + wmmps_ac =3D psta->uapsd_bk & BIT(1); break; case 4: case 5: - wmmps_ac =3D psta->uapsd_vi&BIT(1); + wmmps_ac =3D psta->uapsd_vi & BIT(1); break; case 6: case 7: - wmmps_ac =3D psta->uapsd_vo&BIT(1); + wmmps_ac =3D psta->uapsd_vo & BIT(1); break; case 0: case 3: default: - wmmps_ac =3D psta->uapsd_be&BIT(1); + wmmps_ac =3D psta->uapsd_be & BIT(1); break; } =20 --=20 2.52.0 From nobody Sat Feb 7 17:09:49 2026 Received: from mail-pj1-f41.google.com (mail-pj1-f41.google.com [209.85.216.41]) (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 82ED933556B for ; Fri, 16 Jan 2026 05:31:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768541489; cv=none; b=dWnCKpaRjaTDaunol2/k+0KH23Z8BlxnKXSe9htfZQprskj69SsomPUkm7IPGfxJ0EDeAi3BxDO1SyUfj4iu0zGmmDRNyyaVvYqxPeuBhZs8wjnaFHFX1cuefCySRjjK27ufOjHvto8LB9BbJ/LkOr+VG5pFHABw8F13Ifa+YSg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768541489; c=relaxed/simple; bh=5b1LlWehatVX+sb5h96WFNtecIQVEi5N1k1ZIBqeS8U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p41xb8F1I94Wdc5kkL9s8rc8/ec5oLKHCG9GdyJc/6XCU0jbmxZBPclu7nQfw95LFCyxsIr7J7e3QAqOhfCLDREMaAQDCsyYlz6zGb0ZJFVH+phjsmfzxiexWGHkEXKHsoeTfNtJbtM+A0pJ/4Lhm0EwkUtUm+oxuRBZUTLWhpA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=NriwogKO; arc=none smtp.client-ip=209.85.216.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NriwogKO" Received: by mail-pj1-f41.google.com with SMTP id 98e67ed59e1d1-350fe1f8ea3so758365a91.2 for ; Thu, 15 Jan 2026 21:31:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768541488; x=1769146288; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l9GETDT21OzDnl6aqExkWZEHWIaqzzF9p3+XH4knavM=; b=NriwogKOK9Jmuhwp7h/MHFDyx78DxkxzRj+2GSZHKbaJQMlg4XTY+b27lU6PaLQ0VM 9cNG9CNp5DmTKYbf/fblysdbgRwGDj5TZ63xh1+IMnFr8URmxUiB131pbeopvG818dw/ TuXR3L6g8ejxWJzNIbsCES3SVGq4J65OzQc1wgtMRP4GcuDdpjDDMqWFSdR0yr5y8oxu cGrh+lQI0QffhrMHSHVkjTqruA5cPYvWmbqnNvMVYuTP9fLR9C4493yyl+9LOO1Ov0FU PV3vYrpaxjDQoT56a88TZYl3/0qFysiiCsoIQ2DMUnvdEpFy/hw444h+j9KQVj9RRiF1 A2jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768541488; x=1769146288; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=l9GETDT21OzDnl6aqExkWZEHWIaqzzF9p3+XH4knavM=; b=lUaVrKSBYq4xvg8nQCdqdWFhVzV3LDgb2X9LZmzdZocWzkhd1qAeaTqxO8Ij+da/1Q t8BEMkEz+eZcEfPyIv7R5FOzL4MgYOZ+wO3+ZhMXXfQeEdh10JHBQT1ELoi3Hret2tba qY/oI9QKCzvypbBHUsuQNJ8fFu0f16hSpzzxGe2bREv+yE/URWDYlrA7bCOZUA4Gz0x+ SPRJQK76tqQexmXQb/FnF21Ex6Ahucjl8wZDIpVj0MAX7ZkJ0zrUavgL1UycaGqTUlms IBx62ISRJU/OvTShfy/iVvcfZ2XpAZE04Z9p3Sw8ErfG8ojK5sv9VwUEgQ8yCUcAjYre 2VRA== X-Forwarded-Encrypted: i=1; AJvYcCUvgnxS2E8G4uw+WFKBhnAhqpRVdwylPl1kxrtrPpmZAf6f5bXve3fjsST3BGBQFVmGjFXFS+rTrwFzD0Q=@vger.kernel.org X-Gm-Message-State: AOJu0Ywg8sX1Q9fbZl3ccn61NDubnmyfbtq8W4NKEWOnYsXCZAtd6n/B pczsYIxsBu8PW166nuOgFmiRpWTfiNkURKvguScjX13cTi4f2XXD1+M+ X-Gm-Gg: AY/fxX4vR6U+6allzY7AQFPOGQmDjDdPkBnEQGs9VLCyPCMvp3lpY3nLtKJm3i7Ljuz d/d1E868+Aftjd2jXVrqgXMtNowMY6waZ2k6uzNcO2TOqwzz05g+Xj8rD5bOLZ+EPWDFEcDCex0 K4suXD71NN/6QTSbBI8eBtRjLt574ndKYmWZfygokS/SiZf6/GnLY2ccy/zy4pCxcywOIWStALm 8/AB7VtfyrFAMt3HlT7UeKQdOC52FpNgcN3totGA0tmfu/8FWBaPRUj9f2MxQkMNZ3T+X1oGY/Y uS698ig4BggKQrrdwwG4rzVV3CTbalj3H6mivlqnOL7WnYafLSj+g59YJpgfwoq2rn5vEACiwRJ EMGiXPOnL5GeFYoCFU8ADGII5MrEQUdLo3WkWmIZADc/LTR2yvnpAqe+uJzidtcVIONiTa0xHuK UCMoMhkuG4o2DbHa+hbA== X-Received: by 2002:a17:90b:5603:b0:340:2a16:94be with SMTP id 98e67ed59e1d1-35272ef6716mr1407450a91.4.1768541487705; Thu, 15 Jan 2026 21:31:27 -0800 (PST) Received: from snowman ([2401:4900:4ffd:9a9f:7003:5e9c:3fa9:4130]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35274445a03sm297321a91.7.2026.01.15.21.31.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 21:31:27 -0800 (PST) From: Khushal Chitturi To: gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, straube.linux@gmail.com, hansg@kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Khushal Chitturi Subject: [PATCH v3 2/4] staging: rtl8723bs: simplify boolean expressions Date: Fri, 16 Jan 2026 11:00:50 +0530 Message-ID: <20260116053052.4198-3-khushalchitturi@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260116053052.4198-1-khushalchitturi@gmail.com> References: <20260116053052.4198-1-khushalchitturi@gmail.com> 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 Content-Type: text/plain; charset="utf-8" Simplify boolean expressions in rtw_xmit.c to comply with the kernel coding style Signed-off-by: Khushal Chitturi --- Changelog: v2 -> v3: Resubmitted as a versioned series to avoid threading confusion. v1 -> v2: Corrected commit messages. drivers/staging/rtl8723bs/core/rtw_xmit.c | 38 ++++++++++++----------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index bbc42db1c828..97e38ef62ac4 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -384,7 +384,8 @@ static void update_attrib_vcs_info(struct adapter *pada= pter, struct xmit_frame * } else { while (true) { /* IOT action */ - if ((pmlmeinfo->assoc_AP_vendor =3D=3D HT_IOT_PEER_ATHEROS) && (pattrib= ->ampdu_en =3D=3D true) && + if ((pmlmeinfo->assoc_AP_vendor =3D=3D HT_IOT_PEER_ATHEROS) && + (pattrib->ampdu_en) && (padapter->securitypriv.dot11PrivacyAlgrthm =3D=3D _AES_)) { pattrib->vcs_mode =3D CTS_TO_SELF; break; @@ -420,7 +421,7 @@ static void update_attrib_vcs_info(struct adapter *pada= pter, struct xmit_frame * /* to do list: check MIMO power save condition. */ =20 /* check AMPDU aggregation for TXOP */ - if (pattrib->ampdu_en =3D=3D true) { + if (pattrib->ampdu_en) { pattrib->vcs_mode =3D RTS_CTS; break; } @@ -482,10 +483,10 @@ static s32 update_attrib_sec_info(struct adapter *pad= apter, struct pkt_attrib *p memset(pattrib->dot11tkiptxmickey.skey, 0, 16); pattrib->mac_id =3D psta->mac_id; =20 - if (psta->ieee8021x_blocked =3D=3D true) { + if (psta->ieee8021x_blocked) { pattrib->encrypt =3D 0; =20 - if ((pattrib->ether_type !=3D 0x888e) && (check_fwstate(pmlmepriv, WIFI_= MP_STATE) =3D=3D false)) { + if ((pattrib->ether_type !=3D 0x888e) && (!check_fwstate(pmlmepriv, WIFI= _MP_STATE))) { res =3D _FAIL; goto exit; } @@ -639,8 +640,8 @@ static s32 update_attrib(struct adapter *padapter, stru= ct sk_buff *pkt, struct p memcpy(pattrib->dst, ðerhdr.h_dest, ETH_ALEN); memcpy(pattrib->src, ðerhdr.h_source, ETH_ALEN); =20 - if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) =3D=3D true)) { + if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) || + (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))) { memcpy(pattrib->ra, pattrib->dst, ETH_ALEN); memcpy(pattrib->ta, pattrib->src, ETH_ALEN); } else if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { @@ -704,7 +705,8 @@ static s32 update_attrib(struct adapter *padapter, stru= ct sk_buff *pkt, struct p if (!psta) { /* if we cannot get psta =3D> drop the pkt */ res =3D _FAIL; goto exit; - } else if ((check_fwstate(pmlmepriv, WIFI_AP_STATE) =3D=3D true) && (!(p= sta->state & _FW_LINKED))) { + } else if ((check_fwstate(pmlmepriv, WIFI_AP_STATE)) && + (!(psta->state & _FW_LINKED))) { res =3D _FAIL; goto exit; } @@ -880,7 +882,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr,= struct pkt_attrib *pattr SetFrameSubType(fctrl, pattrib->subtype); =20 if (pattrib->subtype & WIFI_DATA_TYPE) { - if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) =3D=3D true) { + if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { /* to_ds =3D 1, fr_ds =3D 0; */ =20 { @@ -894,7 +896,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr,= struct pkt_attrib *pattr =20 if (pqospriv->qos_option) qos_option =3D true; - } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE) =3D=3D true) { + } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) { /* to_ds =3D 0, fr_ds =3D 1; */ SetFrDs(fctrl); memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN); @@ -903,8 +905,8 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr,= struct pkt_attrib *pattr =20 if (pattrib->qos_en) qos_option =3D true; - } else if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) =3D=3D true) || - (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) =3D=3D true)) { + } else if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) || + (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE))) { memcpy(pwlanhdr->addr1, pattrib->dst, ETH_ALEN); memcpy(pwlanhdr->addr2, pattrib->src, ETH_ALEN); memcpy(pwlanhdr->addr3, get_bssid(pmlmepriv), ETH_ALEN); @@ -962,7 +964,7 @@ s32 rtw_make_wlanhdr(struct adapter *padapter, u8 *hdr,= struct pkt_attrib *pattr pattrib->ampdu_en =3D true; =20 /* re-check if enable ampdu by BA_starting_seqctrl */ - if (pattrib->ampdu_en =3D=3D true) { + if (pattrib->ampdu_en) { u16 tx_seq; =20 tx_seq =3D psta->BA_starting_seqctrl[pattrib->priority & 0x0f]; @@ -1113,7 +1115,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, = struct sk_buff *pkt, struct =20 frg_inx++; =20 - if (bmcst || (rtw_endofpktfile(&pktfile) =3D=3D true)) { + if (bmcst || (rtw_endofpktfile(&pktfile))) { pattrib->nr_frags =3D frg_inx; =20 pattrib->last_txcmdsz =3D pattrib->hdrlen + pattrib->iv_len + @@ -1139,7 +1141,7 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, = struct sk_buff *pkt, struct =20 xmitframe_swencrypt(padapter, pxmitframe); =20 - if (bmcst =3D=3D false) + if (!bmcst) update_attrib_vcs_info(padapter, pxmitframe); else pattrib->vcs_mode =3D NONE_VCS; @@ -1978,14 +1980,14 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_bu= ff **ppkt) do_queue_select(padapter, &pxmitframe->attrib); =20 spin_lock_bh(&pxmitpriv->lock); - if (xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe) =3D=3D true)= { + if (xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe)) { spin_unlock_bh(&pxmitpriv->lock); return 1; } spin_unlock_bh(&pxmitpriv->lock); =20 /* pre_xmitframe */ - if (rtw_hal_xmit(padapter, pxmitframe) =3D=3D false) + if (!rtw_hal_xmit(padapter, pxmitframe)) return 1; =20 return 0; @@ -2029,7 +2031,7 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct = adapter *padapter, struct x signed int bmcst =3D is_multicast_ether_addr(pattrib->ra); bool update_tim =3D false; =20 - if (check_fwstate(pmlmepriv, WIFI_AP_STATE) =3D=3D false) + if (!check_fwstate(pmlmepriv, WIFI_AP_STATE)) return ret; psta =3D rtw_get_stainfo(&padapter->stapriv, pattrib->ra); if (pattrib->psta !=3D psta) @@ -2154,7 +2156,7 @@ static void dequeue_xmitframes_to_sleeping_queue(stru= ct adapter *padapter, struc =20 ret =3D xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe); =20 - if (true =3D=3D ret) { + if (ret) { ptxservq =3D rtw_get_sta_pending(padapter, psta, pattrib->priority, (u8= *)(&ac_index)); =20 ptxservq->qcnt--; --=20 2.52.0 From nobody Sat Feb 7 17:09:49 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 6DA3434320A for ; Fri, 16 Jan 2026 05:31:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768541496; cv=none; b=bHEF2UR2gE8grNt1C9S8wlZ1RCneLzfUd8t40qnLyAY56Y1mU5rfLYgiBUunhc0JQ//Ud51DGBfeKob/dUZaPmqt9zSqAwxEKDg59Uql6XAsBMT0S6t56BW0665cI18YkXigndfZIYNrqc8cJLoXc4mRKdcDeYybfEtC6Vp+xE0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768541496; c=relaxed/simple; bh=w1QjQXCOv1bfh9W5mkRQD18AYg09Hk0JoLaQD5X8oHI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EaVdnvBs7xtl7GrKt9YnTql5i0GPWgINDyvoWKpM5ftEX5HtWUsGaqllv5MnuyZgaqHL555YTxOwe8RlqX3yn3ExYzEWXbMfXG4UvC7MGAmVFT2wVpg9L8aAANmqSEHrRPzYjrn5VdHm0ejIi43ifiaEsY6xWWs8xYm+1ZSDvyE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kQ6p1PJE; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kQ6p1PJE" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2a1388cdac3so11723795ad.0 for ; Thu, 15 Jan 2026 21:31:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768541495; x=1769146295; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KQw+sLTbJBvLuB3MJyj+YsJX6wofShLbCUqa2/jMmFQ=; b=kQ6p1PJEP+iugQ9fVQJ509blFzVNaclQ1BcAM7WReNSSYyxsQgwVXNC2dVzvOrRUE2 3/0C0QKT/nTZcIk40j84zFm/ahrhpg+lp6L/TZxr7YPEU8Ae+lLoo0AUZBafiE5CK/yN hhj3BaRt0FmoRB09476QT80fJ60UnjWjjtpHorJ6KJaeYYGk+ypIDrAKrA4O5n4beaYa hwwTprcKIZIOqSDM0Vz41uxYRtwU/zlJ4FuMRXI/ezQnFNXJL19T5z1KEmwDSVNOuFhI jCGWQrALCo3xS8MQEa5pkJQJkkkjNEwZ4tcIsB+KcqhXZGX53qwt0sG2hQNsdYLLw48e btiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768541495; x=1769146295; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=KQw+sLTbJBvLuB3MJyj+YsJX6wofShLbCUqa2/jMmFQ=; b=dautQ6GMRHypA0Po1Ar0f1Wc40EgecjiY3S4DorrWhZ7YIzaR9qphhXSn4oGxrcGI9 MSieopBG60WKGn/n+QrBIZvOeMvWv6yRD9cqjeVOXdaJvlKXXbVdHNlWkHk5JYmtdb7t 2Gtpf/MLZxc8mPlBETTvVci3d+W+n/CTbW6i2Lsdcp7CpN6ilXkDHwsenE2Byhb6Js6Y aPCw/9dbDfZHGwuZhYecP5HFz2S6PSuYVNBeDlnney5zOMWVf6e/7yLWG0JEvHiEfDws uxR9KuHf5oSKlVni2wK8fzhjReo+NnZFIdvTDAdTxgP51ViSm2rrsbtyFuWD2kYM7ydJ js5g== X-Forwarded-Encrypted: i=1; AJvYcCXuCVwozGA79x/9aSRYop/UJCUtGsho7SX01AxfenhLYRRk7dEBTiyPDSjPQMFXTEK6tOMu+eTcoyguX9w=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2B++bmygtgu/UBGYmAsqf3fF5w9TM12AFvjkCgVihTvwYdM4n nGWtOATKnqnNS6VdQIz2o5S4kgwfet42GVJCABzHtjpV3o69Zjim+cYRRV6ANCmdKSM= X-Gm-Gg: AY/fxX6FSqq8+eUqWCx8lZNjcHgw9wRgR2fz7+fk9SparZcORZYKMRQvmJmcQ8nWt12 YHcemqdP4YNopg3hetuxwlPPz11zk7CHsRVgLsMm+u4D1oc8foCHeYT7sd/uo2i/bOiBd16+10I lPclmPoCLQNu10AJcBto3QcT1ZEW2BN1vkjW8xcbCSQHq6f+pBl3WTz4ZE4/kRzuilZziHPvWac yl5dK/LH4LxrDFbRUE9NOXUAxvvWMiTli9Bbxylx+fDlv6Ue2g342uodCPuS7GeUaWz60Z1jesj mPiSQrntZVu/co1g4bQ1FrmdwbzdnNb/c7jBH16HUCXL99ewIJGx8QeEUf72EKGbEpbTX0z7Wyy wxP+YgeUdzDI+loNUkwwp5DyH+lYpwsHViN9lhUn+bUVTN+7Qb7QLnAhqv0vcvnZ/vRKCaJN5iG mrvXcl3dvltfIsduDMwA== X-Received: by 2002:a17:902:d2d0:b0:2a0:9656:a218 with SMTP id d9443c01a7336-2a7175a331fmr19155465ad.28.1768541494729; Thu, 15 Jan 2026 21:31:34 -0800 (PST) Received: from snowman ([2401:4900:4ffd:9a9f:7003:5e9c:3fa9:4130]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35274445a03sm297321a91.7.2026.01.15.21.31.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 21:31:34 -0800 (PST) From: Khushal Chitturi To: gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, straube.linux@gmail.com, hansg@kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Khushal Chitturi Subject: [PATCH v3 3/4] staging: rtl8723bs: rename CamelCase identifiers to snake_case Date: Fri, 16 Jan 2026 11:00:51 +0530 Message-ID: <20260116053052.4198-4-khushalchitturi@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260116053052.4198-1-khushalchitturi@gmail.com> References: <20260116053052.4198-1-khushalchitturi@gmail.com> 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 Content-Type: text/plain; charset="utf-8" Rename several CamelCase identifiers across the driver to follow kernel naming conventions. The following identifiers were renamed: 1) UserPriority to user_priority 2) NumTxOkInPeriod to tx_ok_in_period 3) HTOpMode to ht_op_mode Signed-off-by: Khushal Chitturi --- Changelog: v2 -> v3: Resubmitted as a versioned series. v1 -> v2: Corrected commit messages. drivers/staging/rtl8723bs/core/rtw_cmd.c | 17 ++++++++++------- drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 17 +++++++++-------- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 2 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 6 +++--- 5 files changed, 24 insertions(+), 20 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index ef2d92b5588a..005e6737e1af 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -1148,10 +1148,11 @@ u8 traffic_status_watchdog(struct adapter *padapter= , u8 from_timer) BusyThreshold =3D BusyThresholdLow; =20 if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > BusyThreshold || - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold) { + pmlmepriv->LinkDetectInfo.tx_ok_in_period > BusyThreshold) { bBusyTraffic =3D true; =20 - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectIn= fo.NumTxOkInPeriod) + if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > + pmlmepriv->LinkDetectInfo.tx_ok_in_period) bRxBusyTraffic =3D true; else bTxBusyTraffic =3D true; @@ -1159,18 +1160,20 @@ u8 traffic_status_watchdog(struct adapter *padapter= , u8 from_timer) =20 /* Higher Tx/Rx data. */ if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 4000 || - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 4000) { + pmlmepriv->LinkDetectInfo.tx_ok_in_period > 4000) { bHigherBusyTraffic =3D true; =20 - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectIn= fo.NumTxOkInPeriod) + if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > + pmlmepriv->LinkDetectInfo.tx_ok_in_period) bHigherBusyRxTraffic =3D true; else bHigherBusyTxTraffic =3D true; } =20 /* check traffic for powersaving. */ - if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->Link= DetectInfo.NumTxOkInPeriod) > 8) || - (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2)) { + if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + + pmlmepriv->LinkDetectInfo.tx_ok_in_period) > 8) || + (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2)) { bEnterPS =3D false; =20 if (bBusyTraffic) { @@ -1214,7 +1217,7 @@ u8 traffic_status_watchdog(struct adapter *padapter, = u8 from_timer) } =20 pmlmepriv->LinkDetectInfo.NumRxOkInPeriod =3D 0; - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod =3D 0; + pmlmepriv->LinkDetectInfo.tx_ok_in_period =3D 0; pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod =3D 0; pmlmepriv->LinkDetectInfo.bBusyTraffic =3D bBusyTraffic; pmlmepriv->LinkDetectInfo.bTxBusyTraffic =3D bTxBusyTraffic; diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 98704179ad35..6b8923109c47 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -2518,7 +2518,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter,= struct xmit_frame *pxmitfr s32 bmcst =3D is_multicast_ether_addr(pattrib->ra); =20 /* if (bmcst || (padapter->mlmepriv.LinkDetectInfo.bTxBusyTraffic =3D=3D = false)) */ - if (bmcst || (padapter->mlmepriv.LinkDetectInfo.NumTxOkInPeriod < 100)) + if (bmcst || (padapter->mlmepriv.LinkDetectInfo.tx_ok_in_period < 100)) return; =20 priority =3D pattrib->priority; diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index 97e38ef62ac4..39477b7c443d 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -403,10 +403,11 @@ static void update_attrib_vcs_info(struct adapter *pa= dapter, struct xmit_frame * =20 /* check HT op mode */ if (pattrib->ht_en) { - u8 HTOpMode =3D pmlmeinfo->HT_protection; + u8 ht_op_mode =3D pmlmeinfo->HT_protection; =20 - if ((pmlmeext->cur_bwmode && (HTOpMode =3D=3D 2 || HTOpMode =3D=3D 3))= || - (!pmlmeext->cur_bwmode && HTOpMode =3D=3D 3)) { + if ((pmlmeext->cur_bwmode && + (ht_op_mode =3D=3D 2 || ht_op_mode =3D=3D 3)) || + (!pmlmeext->cur_bwmode && ht_op_mode =3D=3D 3)) { pattrib->vcs_mode =3D RTS_CTS; break; } @@ -605,17 +606,17 @@ static void set_qos(struct pkt_file *ppktfile, struct= pkt_attrib *pattrib) { struct ethhdr etherhdr; struct iphdr ip_hdr; - s32 UserPriority =3D 0; + s32 user_priority =3D 0; =20 _rtw_open_pktfile(ppktfile->pkt, ppktfile); _rtw_pktfile_read(ppktfile, (unsigned char *)ðerhdr, ETH_HLEN); =20 - /* get UserPriority from IP hdr */ + /* get user_priority from IP hdr */ if (pattrib->ether_type =3D=3D 0x0800) { _rtw_pktfile_read(ppktfile, (u8 *)&ip_hdr, sizeof(ip_hdr)); - UserPriority =3D ip_hdr.tos >> 5; + user_priority =3D ip_hdr.tos >> 5; } - pattrib->priority =3D UserPriority; + pattrib->priority =3D user_priority; pattrib->hdrlen =3D WLAN_HDR_A3_QOS_LEN; pattrib->subtype =3D WIFI_QOS_DATA_TYPE; } @@ -1391,7 +1392,7 @@ void rtw_count_tx_stats(struct adapter *padapter, str= uct xmit_frame *pxmitframe, if ((pxmitframe->frame_tag & 0x0f) =3D=3D DATA_FRAMETAG) { pkt_num =3D pxmitframe->agg_num; =20 - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod +=3D pkt_num; + pmlmepriv->LinkDetectInfo.tx_ok_in_period +=3D pkt_num; =20 pxmitpriv->tx_pkts +=3D pkt_num; =20 diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/r= tl8723bs/hal/hal_btcoex.c index 9105594d2dde..ad2b79cb6f0a 100644 --- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c +++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c @@ -366,7 +366,7 @@ static u8 halbtcoutsrc_Get(void *pBtcContext, u8 getTyp= e, void *pOutBuf) struct rt_link_detect_t *plinkinfo; plinkinfo =3D &padapter->mlmepriv.LinkDetectInfo; =20 - if (plinkinfo->NumTxOkInPeriod > plinkinfo->NumRxOkInPeriod) + if (plinkinfo->tx_ok_in_period > plinkinfo->NumRxOkInPeriod) *pU4Tmp =3D BTC_WIFI_TRAFFIC_TX; else *pU4Tmp =3D BTC_WIFI_TRAFFIC_RX; diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging= /rtl8723bs/include/rtw_mlme.h index 2a128568c6df..b40b10a854a9 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -93,9 +93,9 @@ struct sitesurvey_ctrl { }; =20 struct rt_link_detect_t { - u32 NumTxOkInPeriod; - u32 NumRxOkInPeriod; - u32 NumRxUnicastOkInPeriod; + u32 tx_ok_in_period; + u32 NumRxOkInPeriod; + u32 NumRxUnicastOkInPeriod; bool bBusyTraffic; bool bTxBusyTraffic; bool bRxBusyTraffic; --=20 2.52.0 From nobody Sat Feb 7 17:09:49 2026 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 8A89634320A for ; Fri, 16 Jan 2026 05:31:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768541503; cv=none; b=iOQ+ia8D+0I+B+maTBlyfJvVR5Y9Ykn3ccxmkZWnprQJS7hgf/hMkHaO490d7j9SwsWuGt5KIJtdwEVG7D+/IqlDYkEeR04UfqxZfxDuhZtm1zr6W3a0Awlh9PkEAxtgqkjRyjV1HeGXUM9szqVQJnIpl8NmvjAoyv1f/YkyorY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768541503; c=relaxed/simple; bh=5Y5QndIrLc9S1qT+c+9UAAlRMn83CAZIHHAGQ8Yzjyo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CiT/7XFRqvl5hZ5Uw033r7Stu3bYX+BF3Zw9KNWS3ZM2KS/5EzMKJ4pT2wFVdHFWLXWI6gHdvR1tg15XIu+qr556Zj8LC4NTXQALA6eojr8YSRVNY+DVghxan66nDNKbGYIFQAEqcAJypMvQLvY9iMXKfBni8lEFUHCcnh/EtTc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Yv1V+2pn; arc=none smtp.client-ip=209.85.216.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Yv1V+2pn" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-34c21417781so836922a91.3 for ; Thu, 15 Jan 2026 21:31:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768541501; x=1769146301; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p4hMqnktaa1t/7256R2h6tnrGbLaq3o+BO6KI4wMMZE=; b=Yv1V+2pne5zAXsFo/OU+KOa4G96uDhRUHe0QYEyQNNOaK/rVEaPRDQcIL+8t6NNl45 hLOUI7Yp9TeKAa1pmOe2nJ5+Binl2KRhu9S6REfqjcdBYNXI2Y33+UZaXSsLeLWsr4D0 lOO6Kv3FKI+ZtHzMSihHc1SJ1ayKMi57uo2LcSi+8cIRb9uYDuNj2x1e2/GDGLAMqTuh QOg/+AFpwqjmtlOiAlttYNP9w2ChIoQX1YOvabU0LXTJiWwRRnWmYeQEFSI9gcDo6NaJ vlGK0soFvV6WKeW7UD11jNFKN9r8nVGDEPW1llgLHi4jdJhLaEk/5MlGLE21WVi5Rar8 GnIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768541501; x=1769146301; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=p4hMqnktaa1t/7256R2h6tnrGbLaq3o+BO6KI4wMMZE=; b=Yq+awxrS33uZkH738WhFQmguezn/Pqv1zCN0tIBVUmctABBXUv/dAb4NKLsPC/7aLb qh3vGWJt4QPUfMqHzzHTp6N4GHYz/sNWIBwFpEjQ2sc+U4HPQhRLzrNGELAmtt/ChfcQ FgtuundKINmx7RzpNFg8mFNerHKEmqs7cz/L0Ig0nIol7p8rF31JKQslYgVB9nnWXfOE SSXMNIQSFEGWa6NyqKPFWvYIJ8SkgX5IZFYXWhgmiU8Z0taxHkcBeIGfJ6tyMyEmPpgb //aBH91gghgfypylMkuGxVSHnXoz4s/C5CxVCxsfzXsMSyTyNcKIOFA4kFAoq/zbOmmT PTvw== X-Forwarded-Encrypted: i=1; AJvYcCWXeBaQif9ttnE6G/H/lb+yVCbKqBVkVSpCwhArUrNfOFOIflqyXMvJ0eRNt/7cvIwp/HiO2EmZv0w/Reo=@vger.kernel.org X-Gm-Message-State: AOJu0Yy4E3UXQnFJrndxQO6KVSCisZHneIlGl7Y6XbbECrpyLKcLQMJ7 6QevhrH6vVty4+GVwpZQAaBsxCQGDghXyx7oQCLrhKZTVlDFdm1K0cnb X-Gm-Gg: AY/fxX73lTvrS8zdemkVHXxywXUMoaFMvuzval1QwNnUs5sfj8a72yrNOMiz4STUhsM GonNaPNcI2WAM3xyeMStxYlojNiJft0I13zfLyDJ36M0PG5ICOpSdZXY683wO02cav3EaCw2SMw 74JsD6V0ZLmbxUBG4/YllF/uPZs6Bdc+ipAMjJsg889Kr1dBJPjpLmTLAfTwL1V71v6wzqgIb/3 7IrWXnse42WdHRl7KM7StsmpZa9/rb/CMSFnPajIRquVjRUGMBEyIlzvvyMxwY8VzrWDHSY8jkU RCqmNWWyNXuq1bB6RdypIVWKIabaQB46KWecgOVcsJ1M3h6cNqR+KqSOdC5lD11by6mHGAdyuGj 2WLKsSVNAmxYVbi5MuJsNbOfkxiPfm0gX+HDyDrziK+T3WxsiFC0heaP+Vxn/zq+Lff6sRqh7+U b4WPwuN7lR7hN3EIbyuQ== X-Received: by 2002:a17:90b:3f4d:b0:34f:6312:f22c with SMTP id 98e67ed59e1d1-35272d9bf76mr1636532a91.0.1768541500890; Thu, 15 Jan 2026 21:31:40 -0800 (PST) Received: from snowman ([2401:4900:4ffd:9a9f:7003:5e9c:3fa9:4130]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35274445a03sm297321a91.7.2026.01.15.21.31.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 21:31:40 -0800 (PST) From: Khushal Chitturi To: gregkh@linuxfoundation.org Cc: dan.carpenter@linaro.org, straube.linux@gmail.com, hansg@kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Khushal Chitturi Subject: [PATCH v3 4/4] staging: rtl8723bs: fix line length and alignment issues Date: Fri, 16 Jan 2026 11:00:52 +0530 Message-ID: <20260116053052.4198-5-khushalchitturi@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260116053052.4198-1-khushalchitturi@gmail.com> References: <20260116053052.4198-1-khushalchitturi@gmail.com> 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 Content-Type: text/plain; charset="utf-8" Fix multiple coding style issues in rtw_xmit.c to comply with the kernel coding style by splitting expressions and adjusting alignment. This patch resolves checkpatch.pl warnings caused by line length exceeding 100 columns and alignment matching the open parenthesis. Signed-off-by: Khushal Chitturi --- Changelog: v2 -> v3: Resubmitted as a versioned series to resolve threading confusion. v1 -> v2: No changes. drivers/staging/rtl8723bs/core/rtw_xmit.c | 94 +++++++++++++++-------- 1 file changed, 60 insertions(+), 34 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index 39477b7c443d..4cc41d1f4836 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -126,10 +126,14 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, = struct adapter *padapter) pxmitbuf->buf_tag =3D XMITBUF_DATA; =20 /* Tx buf allocation may fail sometimes, so sleep and retry. */ - res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ += XMITBUF_ALIGN_SZ), true); + res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, + (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ), + true); if (res =3D=3D _FAIL) { msleep(10); - res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ = + XMITBUF_ALIGN_SZ), true); + res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, + (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ), + true); if (res =3D=3D _FAIL) goto exit; } @@ -208,7 +212,9 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) pxmitbuf->padapter =3D padapter; pxmitbuf->buf_tag =3D XMITBUF_MGNT; =20 - res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, MAX_XMIT_EXTBUF_S= Z + XMITBUF_ALIGN_SZ, true); + res =3D rtw_os_xmit_resource_alloc(padapter, pxmitbuf, + MAX_XMIT_EXTBUF_SZ + XMITBUF_ALIGN_SZ, + true); if (res =3D=3D _FAIL) { res =3D _FAIL; goto exit; @@ -291,7 +297,9 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) } =20 for (i =3D 0; i < NR_XMITBUFF; i++) { - rtw_os_xmit_resource_free(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_= ALIGN_SZ), true); + rtw_os_xmit_resource_free(padapter, pxmitbuf, + (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ), + true); =20 pxmitbuf++; } @@ -313,7 +321,9 @@ void _rtw_free_xmit_priv(struct xmit_priv *pxmitpriv) /* free xmit extension buff */ pxmitbuf =3D (struct xmit_buf *)pxmitpriv->pxmit_extbuf; for (i =3D 0; i < NR_XMIT_EXTBUFF; i++) { - rtw_os_xmit_resource_free(padapter, pxmitbuf, (MAX_XMIT_EXTBUF_SZ + XMIT= BUF_ALIGN_SZ), true); + rtw_os_xmit_resource_free(padapter, pxmitbuf, + (MAX_XMIT_EXTBUF_SZ + XMITBUF_ALIGN_SZ), + true); =20 pxmitbuf++; } @@ -367,7 +377,9 @@ static void update_attrib_vcs_info(struct adapter *pada= pter, struct xmit_frame * sz =3D pattrib->last_txcmdsz; =20 /* (1) RTS_Threshold is compared to the MPDU, not MSDU. */ - /* (2) If there are more than one frag in this MSDU, only the first fra= g uses protection frame. */ + /* (2) If there are more than one frag in this MSDU, + * only the first frag uses protection frame. + */ /* Other fragments are protected by previous fragment. */ /* So we only need to check the length of first fragment. */ if (pmlmeext->cur_wireless_mode < WIRELESS_11_24N || padapter->registryp= riv.wifi_spec) { @@ -437,7 +449,8 @@ static void update_attrib_vcs_info(struct adapter *pada= pter, struct xmit_frame * pattrib->vcs_mode =3D padapter->driver_vcs_type; } =20 -static void update_attrib_phy_info(struct adapter *padapter, struct pkt_at= trib *pattrib, struct sta_info *psta) +static void update_attrib_phy_info(struct adapter *padapter, struct pkt_at= trib *pattrib, + struct sta_info *psta) { struct mlme_ext_priv *mlmeext =3D &padapter->mlmeextpriv; =20 @@ -465,7 +478,8 @@ static void update_attrib_phy_info(struct adapter *pada= pter, struct pkt_attrib * pattrib->ch_offset =3D psta->htpriv.ch_offset; pattrib->ampdu_en =3D false; =20 - if (padapter->driver_ampdu_spacing !=3D 0xFF) /* driver control AMPDU Den= sity for peer sta's rx */ + /* driver control AMPDU Density for peer sta's rx */ + if (padapter->driver_ampdu_spacing !=3D 0xFF) pattrib->ampdu_spacing =3D padapter->driver_ampdu_spacing; else pattrib->ampdu_spacing =3D psta->htpriv.rx_ampdu_min_spacing; @@ -473,7 +487,8 @@ static void update_attrib_phy_info(struct adapter *pada= pter, struct pkt_attrib * pattrib->retry_ctrl =3D false; } =20 -static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_att= rib *pattrib, struct sta_info *psta) +static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_att= rib *pattrib, + struct sta_info *psta) { signed int res =3D _SUCCESS; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; @@ -512,7 +527,8 @@ static s32 update_attrib_sec_info(struct adapter *padap= ter, struct pkt_attrib *p } =20 /* For WPS 1.0 WEP, driver should not encrypt EAPOL Packet for WPS hands= hake. */ - if (((pattrib->encrypt =3D=3D _WEP40_) || (pattrib->encrypt =3D=3D _WEP1= 04_)) && (pattrib->ether_type =3D=3D 0x888e)) + if (((pattrib->encrypt =3D=3D _WEP40_) || (pattrib->encrypt =3D=3D _WEP1= 04_)) && + (pattrib->ether_type =3D=3D 0x888e)) pattrib->encrypt =3D _NO_PRIVACY_; } =20 @@ -564,7 +580,7 @@ static s32 update_attrib_sec_info(struct adapter *padap= ter, struct pkt_attrib *p memcpy(pattrib->dot118021x_UncstKey.skey, psta->dot118021x_UncstKey.skey= , 16); =20 if (pattrib->encrypt && - ((padapter->securitypriv.sw_encrypt) || (!psecuritypriv->hw_decrypted))) + ((padapter->securitypriv.sw_encrypt) || (!psecuritypriv->hw_decrypted= ))) pattrib->bswenc =3D true; else pattrib->bswenc =3D false; @@ -656,7 +672,9 @@ static s32 update_attrib(struct adapter *padapter, stru= ct sk_buff *pkt, struct p pattrib->pktlen =3D pktfile.pkt_len; =20 if (pattrib->ether_type =3D=3D ETH_P_IP) { - /* The following is for DHCP and ARP packet, we use cck1M to tx these p= ackets and let LPS awake some time */ + /* The following is for DHCP and ARP packet, + * we use cck1M to tx these packets and let LPS awake some time + */ /* to prevent DHCP protocol fail */ =20 u8 tmp[24]; @@ -667,7 +685,7 @@ static s32 update_attrib(struct adapter *padapter, stru= ct sk_buff *pkt, struct p if (pktfile.pkt_len > 282) {/* MINIMUM_DHCP_PACKET_SIZE) { */ if (pattrib->ether_type =3D=3D ETH_P_IP) {/* IP header */ if (((tmp[21] =3D=3D 68) && (tmp[23] =3D=3D 67)) || - ((tmp[21] =3D=3D 67) && (tmp[23] =3D=3D 68))) { + ((tmp[21] =3D=3D 67) && (tmp[23] =3D=3D 68))) { /* 68 : UDP BOOTP client */ /* 67 : UDP BOOTP server */ pattrib->dhcp_pkt =3D 1; @@ -778,7 +796,8 @@ static s32 xmitframe_addmic(struct adapter *padapter, s= truct xmit_frame *pxmitfr if (pattrib->encrypt =3D=3D _TKIP_) { /* encode mic code */ { - u8 null_key[16] =3D {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, = 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; + u8 null_key[16] =3D {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}; =20 pframe =3D pxmitframe->buf_addr + hw_hdr_offset; =20 @@ -999,9 +1018,9 @@ s32 rtw_txframes_pending(struct adapter *padapter) struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; =20 return ((!list_empty(&pxmitpriv->be_pending.queue)) || - (!list_empty(&pxmitpriv->bk_pending.queue)) || - (!list_empty(&pxmitpriv->vi_pending.queue)) || - (!list_empty(&pxmitpriv->vo_pending.queue))); + (!list_empty(&pxmitpriv->bk_pending.queue)) || + (!list_empty(&pxmitpriv->vi_pending.queue)) || + (!list_empty(&pxmitpriv->vo_pending.queue))); } =20 /* @@ -1031,7 +1050,8 @@ u32 rtw_calculate_wlan_pkt_size_by_attribue(struct pk= t_attrib *pattrib) * 5. move frag chunk from pframe to pxmitframe->mem * 6. apply sw-encrypt, if necessary. */ -s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, = struct xmit_frame *pxmitframe) +s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, + struct xmit_frame *pxmitframe) { struct pkt_file pktfile; =20 @@ -1152,7 +1172,8 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, = struct sk_buff *pkt, struct } =20 /* broadcast or multicast management pkt use BIP, unicast management pkt u= se CCMP encryption */ -s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *= pkt, struct xmit_frame *pxmitframe) +s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *= pkt, + struct xmit_frame *pxmitframe) { u8 *pframe, *mem_start =3D NULL, *tmp_buf =3D NULL; u8 subtype; @@ -1235,7 +1256,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padap= ter, struct sk_buff *pkt, s } else { /* unicast mgmt frame TX */ /* start to encrypt mgmt frame */ if (subtype =3D=3D WIFI_DEAUTH || subtype =3D=3D WIFI_DISASSOC || - subtype =3D=3D WIFI_REASSOCREQ || subtype =3D=3D WIFI_ACTION) { + subtype =3D=3D WIFI_REASSOCREQ || subtype =3D=3D WIFI_ACTION) { if (pattrib->psta) psta =3D pattrib->psta; else @@ -1249,11 +1270,11 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *pad= apter, struct sk_buff *pkt, s =20 /* according 802.11-2012 standard, these five types are not robust type= s */ if (subtype =3D=3D WIFI_ACTION && - (pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_PUBLIC || - pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_HT || - pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_UNPROTECTED_WNM || - pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_SELF_PROTECTED || - pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_P2P)) + (pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_PUBLIC || + pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_HT || + pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_UNPROTECTED_WNM || + pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_SELF_PROTECTED || + pframe[WLAN_HDR_A3_LEN] =3D=3D RTW_WLAN_CATEGORY_P2P)) goto xmitframe_coalesce_fail; /* before encrypt dump the management packet content */ if (pattrib->encrypt > 0) @@ -1410,7 +1431,7 @@ void rtw_count_tx_stats(struct adapter *padapter, str= uct xmit_frame *pxmitframe, } =20 static struct xmit_buf *__rtw_alloc_cmd_xmitbuf(struct xmit_priv *pxmitpri= v, - enum cmdbuf_type buf_type) + enum cmdbuf_type buf_type) { struct xmit_buf *pxmitbuf =3D NULL; =20 @@ -1431,7 +1452,7 @@ static struct xmit_buf *__rtw_alloc_cmd_xmitbuf(struc= t xmit_priv *pxmitpriv, } =20 struct xmit_frame *__rtw_alloc_cmdxmitframe(struct xmit_priv *pxmitpriv, - enum cmdbuf_type buf_type) + enum cmdbuf_type buf_type) { struct xmit_frame *pcmdframe; struct xmit_buf *pxmitbuf; @@ -1768,7 +1789,8 @@ s32 rtw_xmitframe_enqueue(struct adapter *padapter, s= truct xmit_frame *pxmitfram return _SUCCESS; } =20 -struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_= info *psta, signed int up, u8 *ac) +struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_= info *psta, + signed int up, u8 *ac) { struct tx_servq *ptxservq =3D NULL; =20 @@ -2022,7 +2044,8 @@ inline bool xmitframe_hiq_filter(struct xmit_frame *x= mitframe) return allow; } =20 -signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, st= ruct xmit_frame *pxmitframe) +signed int xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, + struct xmit_frame *pxmitframe) { signed int ret =3D false; struct sta_info *psta =3D NULL; @@ -2117,7 +2140,8 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct = adapter *padapter, struct x if (wmmps_ac) psta->sleepq_ac_len++; =20 - if (((psta->has_legacy_ac) && (!wmmps_ac)) || ((!psta->has_legacy_ac) &= & (wmmps_ac))) { + if (((psta->has_legacy_ac) && (!wmmps_ac)) || + ((!psta->has_legacy_ac) && (wmmps_ac))) { if (!(pstapriv->tim_bitmap & BIT(psta->aid))) update_tim =3D true; =20 @@ -2137,7 +2161,8 @@ signed int xmitframe_enqueue_for_sleeping_sta(struct = adapter *padapter, struct x return ret; } =20 -static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter,= struct sta_info *psta, struct __queue *pframequeue) +static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter,= struct sta_info *psta, + struct __queue *pframequeue) { signed int ret; struct list_head *plist, *phead, *tmp; @@ -2158,7 +2183,8 @@ static void dequeue_xmitframes_to_sleeping_queue(stru= ct adapter *padapter, struc ret =3D xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe); =20 if (ret) { - ptxservq =3D rtw_get_sta_pending(padapter, psta, pattrib->priority, (u8= *)(&ac_index)); + ptxservq =3D rtw_get_sta_pending(padapter, psta, pattrib->priority, + (u8 *)(&ac_index)); =20 ptxservq->qcnt--; phwxmits[ac_index].accnt--; @@ -2464,8 +2490,8 @@ struct xmit_buf *dequeue_pending_xmitbuf_under_survey= (struct xmit_priv *pxmitpri type =3D GetFrameSubType(pxmitbuf->pbuf + TXDESC_OFFSET); =20 if ((type =3D=3D WIFI_PROBEREQ) || - (type =3D=3D WIFI_DATA_NULL) || - (type =3D=3D WIFI_QOS_DATA_NULL)) { + (type =3D=3D WIFI_DATA_NULL) || + (type =3D=3D WIFI_QOS_DATA_NULL)) { list_del_init(&pxmitbuf->list); break; } --=20 2.52.0