From nobody Sun Feb 8 17:37:15 2026 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 2677E39CECE for ; Thu, 22 Jan 2026 16:48:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769100504; cv=none; b=m2lDfgaEqo3Qr6x/kfOOIw5zBPwNZJ0ZPl/BPAyIcry9XhxaVPe2QlOMEUw3ol8EbnmFjE2xJk7vKDcnF8f5vYM3OEMFLusi7omQFYNm8/BvKz8HDyRGkaSw9yWUSmxkvnxPB33pvxvsLmBrSQ0BGKGDppd4vpxaB+tWZfERZHw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769100504; c=relaxed/simple; bh=Fk179Kgjd49eZpOBo6DakzximVAgFm87dme/OzzAm9g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QunimX6slGRBJCO9snCD6XX6FLlAwzeqfa2Y9A/fQWtk/ieCcpbkikFs8nJd21Ny3EUZlJJKEgmRoYisnIyTMrKEQG1q3hw1HWFp6kv/67KyCO2vU5rLUk9656YIbRRsbv7m9YhaW1hcVGMcbwY6+Snw3nHedkTG5Tzm3ROiy7s= 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=Eu+/kf+z; arc=none smtp.client-ip=209.85.214.178 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="Eu+/kf+z" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2a0a95200e8so8803365ad.0 for ; Thu, 22 Jan 2026 08:48:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769100491; x=1769705291; 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=TTvK+LM7xjOnWwqq+wggWH8zsPRVLVMxxDlcC5gcvWE=; b=Eu+/kf+zCNvnoGhpK7brTW3j3+ztK35934jxcGNaf1MCiY2+gUfi8N+b8l66KVBhZi pbq6sn2bs1zFT5zT8q2VsxcvxS37dhLJt3ga7POQ9zTRpTk2kdL+MUT+2wzBoEOtwHhe Kkuo+QQC2pFfLl76itNdE6hFQE4cCKzL31XOk6kAkXlH7wdBwHhrIKyrtSD0n9EMzR/R GDkyFfYPqK+SrvtbuophsMtbPsx1b/a0lGolbF78NRcWWASnCFxOpY20WRP8C2iw82PI ShAhq0CJ5l5SsYQcneWXhS/fC5JeEuuedYJyIhMXXGONwmPrhnqpgnfVnphp/xcwhEfl SaZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769100491; x=1769705291; 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=TTvK+LM7xjOnWwqq+wggWH8zsPRVLVMxxDlcC5gcvWE=; b=Q5fawjE7uXJGBH6O6PZQ6btzcZZQeuXf/rlOWUaUTw5jTIctC6rjgVSpCANGjOJQDA AgLO8MGFNd8f4+5pAzfbVj9y2sa0nYs30SPB9C88P0/MNYsx9FczLvo2XnvsLSs6IJlO aaG4fybGfxBFl6euH8/uBtAU+T0+dlm6X+yda8t3/34m3zrFbLd1a30dZsX1xoqIqArA mwCWPhiUmUx+LNVFtZhkez5tRRxjJBVyNsPlhJ1jinYCGU2H2u+SGd6XkbREY+mmEK/U 2xYj4mUc5MXjsqWVeJ/EPyDHMT0WB+YJx4u+l4vgod/2fQW7BQwzFRD1tDj4efd8pnPs AGgg== X-Forwarded-Encrypted: i=1; AJvYcCWV1yJV5+HpzEmAoSRkWc1tg/D0vGLFXHl9v3kvWyhgb5FleMr/aM4DHQafvZIjfeUi20fcmsZZYeXXBSs=@vger.kernel.org X-Gm-Message-State: AOJu0Yxi9DiFsyTLkef6XfPrAelvtnRCP9qERkaZUbRF+SNtI3toDrJI 84lWyVyMNJAfN/VsvmT0YDZGQ+lqWxvQpr5tSx7y91QWibpBELsZae+u X-Gm-Gg: AZuq6aLXMVtCwzbpGw5ttAM9Fj3FGCwJWYLEWdcHywvYTtmCP3FZyOpRnSJXEqIlsUb jh7CmXLdg0LKNsCvGh192cFmR6UeM4r43PIdCzjRalNqU0L70jxAG3EMsGehpNJO+Zj7Sw9M8To s4GcaWaN3uB2bjIpoyrOnvlN/lvgJ2s8HK/A/oHl5MCqSXpSPgMc7KeZ7JD+x0zG1CQ6q2AdM0k FpbEnKl9NHLLPuI2HJvpp2clozgANNZocwJ1QzrtuNyuSdpC5qQDIdzwNKlHliBKmy5TnseuQOD HOP/o173iAflWFP7MeQGmpK0nAILd7JhVbruy/ioxydAOmOgeU4UXWNvH8pkV2SOkyuxSABHMms iV/i7ooCoXvAerHnTtzxhyIBgXvdh8DOO6mL3A8bJ+nSIwLW+qOVUXn5DFr6csYMdGWPJqExTVi jIGSuqJmBIM1P6FmiIcluxCmF0JEiCSS0Xd3Y= X-Received: by 2002:a17:902:ced0:b0:295:3584:1bbd with SMTP id d9443c01a7336-2a7fe73eb54mr302975ad.41.1769100490992; Thu, 22 Jan 2026 08:48:10 -0800 (PST) Received: from snowman.bbrouter ([43.241.121.48]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a7193dd523sm189986225ad.62.2026.01.22.08.48.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jan 2026 08:48:10 -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 v4 1/3] staging: rtl8723bs: simplify boolean expressions Date: Thu, 22 Jan 2026 22:17:49 +0530 Message-ID: <20260122164751.37796-2-khushalchitturi@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260122164751.37796-1-khushalchitturi@gmail.com> References: <20260122164751.37796-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: v3 -> v4: Fixed alignment and removed extra parentheses. v2 -> v3: Resubmitted as a versioned series to avoid threading confusion. v1 -> v2: Corrected commit messages. drivers/staging/rtl8723bs/core/rtw_xmit.c | 40 ++++++++++++----------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index bbc42db1c828..1ab1937fa2d7 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -384,8 +384,9 @@ 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) && - (padapter->securitypriv.dot11PrivacyAlgrthm =3D=3D _AES_)) { + 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 Sun Feb 8 17:37:15 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 015F936072A for ; Thu, 22 Jan 2026 16:48:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769100510; cv=none; b=BwUDFC7tKXKrp2g32JMVSkCC3PUyR1/VzdvyjeZrofjVz3RU4qotgw24HZ0BHGFjCthC9/PmJO7YuSGWVmKVwx0Hmrgt9fA331PcJfK95yPFlCSFzgy5Mm1W31SuNmGwhXgm9FJPKJnkPu8d9j51In1kwnOTm6iQcQOpefnKInU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769100510; c=relaxed/simple; bh=fWdbJsC0Vx/n2+9X7PJdBIzwpNiwAlm/8RrY9+fxIHE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VXJkvZB3af44y9CTr5HhnFiJbNoz16y06/3JbskXdq0f4RsI4eTl0sSUZqt6XNSkBIF7I+zxqSuphLdTEHdWnPojLazXtuPf24TRRB0WqWQRFY4rA6Ign3d+7yK1XKCx1BKCROA9SUT5ESvBuaZaV2TRTObmMxjQ9p8u7hDnqVI= 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=gIIdJg42; arc=none smtp.client-ip=209.85.214.172 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="gIIdJg42" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2a09a3bd9c5so8493995ad.3 for ; Thu, 22 Jan 2026 08:48:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769100497; x=1769705297; 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=zqfhhn628N3fcgAUB6Q+dDfuXWXa6AjyDLgzZbmqr+E=; b=gIIdJg421UCcN0zaPvCTjj+MzLsaHDjxW3w8ZK/XE1TUXCxRt4Nklu/EmhnjYmEAI1 YaerFKUlUSkVLjOIL6padeWazYEdE24R5KkTucw9CkgBh9uOcfaWQkkuuBhwXwvVYRHq 3cxdh9RSP3FJ8RYIMQMhTt+OU5mzB/9Nc1VKZhySAxLQH4XK9f0r7p/k1DcT0EeJafIO R2cHopzJve7t7OoX0U+tH75wrjdgMOEqLr5FqiawvyNeMBYnLBD8D954iCLbkvRKUqEA azXgs4CSa6QM+0qLP4JH3mLZSyFbedcX5uJMfL53EFozLCub2d41RO3wASlDtnz6/hES m+pA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769100497; x=1769705297; 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=zqfhhn628N3fcgAUB6Q+dDfuXWXa6AjyDLgzZbmqr+E=; b=XVam+M+QJuNKQea0B+E1JsXg/ATslt1nwhvYlbbV2jAqqfBsEvKYSB6+VoeGGRoJ1d qWqzoL8RP4xmEDIAbKfQX0cKHqp785CYMat2gurfB0HtgRS1aZ5lx9OZ86cAKVxH+nDA 5UD/By3YwrTUxlm9d1kiWzvSfmmIyredhp1TJoJ+D9XYIf+nYDR71qo7Vf5aPikTW19O GCFe0y2sOJQVIBnZNChBpo2+y2Rn5OrJYZgCQfSElhjgD8htCw23jwdkdVROMx3OP4X5 p8/CBdvxe2uYkofXB2PFiGHhWt+umnC5YjkMxZRVWrOAMBhLRHpfhPwuqnglA+7qmzyW ygxA== X-Forwarded-Encrypted: i=1; AJvYcCXhTnW0EC4O6pyf9xWoCF+lmY31eMmMojkonawjumSvBh/uD8s2A+BJE4qCS8Y4o/xyXywRbeN63pubwFg=@vger.kernel.org X-Gm-Message-State: AOJu0YxwKD9K950vu3KNkl4wwPbzOxC3NQ8RKh3jdgkMu6x13Ynt2pN+ ETJQ/GPX2385aQGnv4VRGH4NiYNrTnH0nrzSQ9hQvYWmWCWPEdl4jhyJ X-Gm-Gg: AZuq6aKeWt8z0FDXlxTSpIOvLmOUILC8vRO0gcVqCxAr3pmMFRkm67ZyDik3JTPSCoR 3ISrAVKCAmqyphSN01AYPD70abxOc7hK8TWl4PRzsklu1A2U6Js6NnwQxeIkl6Xhr6yjOtHRaLH YhQMfjKWufAlx+3tPffvdsk7+L/Dk2iCiDl1GkMQ5U2OtOmYPz2NVCFzZWnPdFkyHPyZc0h4TWb Z2nsp2zSINLGZ0ao2C679ZVT0Pdan7DQ1hGRbaP9WZTlMk2GhjHqkwlAK4xFvHZK0G664IntxnP qnamA/2dCs2OMeSKwqmnC59Of6edv6UT20HZMYcONrKQ34AcE3ZzH4T8OArfL9dxTbsVH2yhJQj b4EL6AVWvCmhuvEXVf//tuNWcH5rXEy+xF7X13e1801tQd9Sor9dd/XVNt0U3o8yXWWH++M+3o7 9GUTh2pT+1HC4pjujeEaJ/HpIa X-Received: by 2002:a17:902:ebc3:b0:2a7:8486:fe63 with SMTP id d9443c01a7336-2a7fe74f2b1mr200565ad.51.1769100496470; Thu, 22 Jan 2026 08:48:16 -0800 (PST) Received: from snowman.bbrouter ([43.241.121.48]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a7193dd523sm189986225ad.62.2026.01.22.08.48.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jan 2026 08:48:16 -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 v4 2/3] staging: rtl8723bs: rename LinkDetectInfo and clean up related code Date: Thu, 22 Jan 2026 22:17:50 +0530 Message-ID: <20260122164751.37796-3-khushalchitturi@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260122164751.37796-1-khushalchitturi@gmail.com> References: <20260122164751.37796-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" This patch renames LinkDetectInfo instance to link_detect_info and updates the fields of rt_link_detect_t to follow kernel naming conventions. Local variables in traffic_status_watchdog were also updated for consistency. Related checkpatch.pl warnings triggered by the rename were also fixed. Signed-off-by: Khushal Chitturi --- Changelog: v3 -> v4: Narrow rename scope to affect link detection, and adjusted formatting. v2 -> v3: Resubmitted as a versioned series. v1 -> v2: Corrected commit messages. drivers/staging/rtl8723bs/core/rtw_cmd.c | 102 ++++++++++-------- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 15 ++- drivers/staging/rtl8723bs/core/rtw_mlme.c | 16 +-- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 10 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- drivers/staging/rtl8723bs/core/rtw_recv.c | 4 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 6 +- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 4 +- drivers/staging/rtl8723bs/include/rtw_mlme.h | 31 +++--- .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 8 +- 12 files changed, 107 insertions(+), 95 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl= 8723bs/core/rtw_cmd.c index ef2d92b5588a..ad673045f522 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -1128,12 +1128,16 @@ static void collect_traffic_statistics(struct adapt= er *padapter) =20 u8 traffic_status_watchdog(struct adapter *padapter, u8 from_timer) { - u8 bEnterPS =3D false; - u16 BusyThresholdHigh =3D 25; - u16 BusyThresholdLow =3D 10; - u16 BusyThreshold =3D BusyThresholdHigh; - u8 bBusyTraffic =3D false, bTxBusyTraffic =3D false, bRxBusyTraffic =3D f= alse; - u8 bHigherBusyTraffic =3D false, bHigherBusyRxTraffic =3D false, bHigherB= usyTxTraffic =3D false; + bool should_enter_ps =3D false; + u16 busy_threshold_high =3D 25; + u16 busy_threshold_low =3D 10; + u16 busy_threshold =3D busy_threshold_high; + bool busy_traffic =3D false; + bool tx_busy_traffic =3D false; + bool rx_busy_traffic =3D false; + bool higher_busy_traffic =3D false; + bool higher_busy_rx_traffic =3D false; + bool higher_busy_tx_traffic =3D false; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; =20 collect_traffic_statistics(padapter); @@ -1143,57 +1147,61 @@ u8 traffic_status_watchdog(struct adapter *padapter= , u8 from_timer) /* */ if ((check_fwstate(pmlmepriv, _FW_LINKED)) /*&& !MgntInitAdapterInProgress(pMgntInfo)*/) { - /* if we raise bBusyTraffic in last watchdog, using lower threshold. */ - if (pmlmepriv->LinkDetectInfo.bBusyTraffic) - BusyThreshold =3D BusyThresholdLow; + /* if we raise busy_traffic in last watchdog, using lower threshold. */ + if (pmlmepriv->link_detect_info.busy_traffic) + busy_threshold =3D busy_threshold_low; =20 - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > BusyThreshold || - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > BusyThreshold) { - bBusyTraffic =3D true; + if (pmlmepriv->link_detect_info.num_rx_ok_in_period > busy_threshold || + pmlmepriv->link_detect_info.num_tx_ok_in_period > busy_threshold) { + busy_traffic =3D true; =20 - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectIn= fo.NumTxOkInPeriod) - bRxBusyTraffic =3D true; + if (pmlmepriv->link_detect_info.num_rx_ok_in_period > + pmlmepriv->link_detect_info.num_tx_ok_in_period) + rx_busy_traffic =3D true; else - bTxBusyTraffic =3D true; + tx_busy_traffic =3D true; } =20 /* Higher Tx/Rx data. */ - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > 4000 || - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod > 4000) { - bHigherBusyTraffic =3D true; + if (pmlmepriv->link_detect_info.num_rx_ok_in_period > 4000 || + pmlmepriv->link_detect_info.num_tx_ok_in_period > 4000) { + higher_busy_traffic =3D true; =20 - if (pmlmepriv->LinkDetectInfo.NumRxOkInPeriod > pmlmepriv->LinkDetectIn= fo.NumTxOkInPeriod) - bHigherBusyRxTraffic =3D true; + if (pmlmepriv->link_detect_info.num_rx_ok_in_period > + pmlmepriv->link_detect_info.num_tx_ok_in_period) + higher_busy_rx_traffic =3D true; else - bHigherBusyTxTraffic =3D true; + higher_busy_tx_traffic =3D true; } =20 /* check traffic for powersaving. */ - if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->Link= DetectInfo.NumTxOkInPeriod) > 8) || - (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2)) { - bEnterPS =3D false; + if ((pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period + + pmlmepriv->link_detect_info.num_tx_ok_in_period) > 8 || + pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period > 2) { + should_enter_ps =3D false; =20 - if (bBusyTraffic) { - if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount <=3D 4) - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 4; + if (busy_traffic) { + if (pmlmepriv->link_detect_info.traffic_transition_count <=3D 4) + pmlmepriv->link_detect_info.traffic_transition_count =3D 4; =20 - pmlmepriv->LinkDetectInfo.TrafficTransitionCount++; + pmlmepriv->link_detect_info.traffic_transition_count++; =20 - if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount > 30/*TrafficTran= sitionLevel*/) - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 30; + /* Check if traffic transition count exceeds the threshold */ + if (pmlmepriv->link_detect_info.traffic_transition_count > 30) + pmlmepriv->link_detect_info.traffic_transition_count =3D 30; } } else { - if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount >=3D 2) - pmlmepriv->LinkDetectInfo.TrafficTransitionCount -=3D 2; + if (pmlmepriv->link_detect_info.traffic_transition_count >=3D 2) + pmlmepriv->link_detect_info.traffic_transition_count -=3D 2; else - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 0; + pmlmepriv->link_detect_info.traffic_transition_count =3D 0; =20 - if (pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D=3D 0) - bEnterPS =3D true; + if (pmlmepriv->link_detect_info.traffic_transition_count =3D=3D 0) + should_enter_ps =3D true; } =20 /* LeisurePS only work in infra mode. */ - if (bEnterPS) { + if (should_enter_ps) { if (!from_timer) LPS_Enter(padapter, "TRAFFIC_IDLE"); } else { @@ -1213,17 +1221,17 @@ u8 traffic_status_watchdog(struct adapter *padapter= , u8 from_timer) LPS_Leave(padapter, "NON_LINKED"); } =20 - pmlmepriv->LinkDetectInfo.NumRxOkInPeriod =3D 0; - pmlmepriv->LinkDetectInfo.NumTxOkInPeriod =3D 0; - pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod =3D 0; - pmlmepriv->LinkDetectInfo.bBusyTraffic =3D bBusyTraffic; - pmlmepriv->LinkDetectInfo.bTxBusyTraffic =3D bTxBusyTraffic; - pmlmepriv->LinkDetectInfo.bRxBusyTraffic =3D bRxBusyTraffic; - pmlmepriv->LinkDetectInfo.bHigherBusyTraffic =3D bHigherBusyTraffic; - pmlmepriv->LinkDetectInfo.bHigherBusyRxTraffic =3D bHigherBusyRxTraffic; - pmlmepriv->LinkDetectInfo.bHigherBusyTxTraffic =3D bHigherBusyTxTraffic; - - return bEnterPS; + pmlmepriv->link_detect_info.num_rx_ok_in_period =3D 0; + pmlmepriv->link_detect_info.num_tx_ok_in_period =3D 0; + pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period =3D 0; + pmlmepriv->link_detect_info.busy_traffic =3D busy_traffic; + pmlmepriv->link_detect_info.tx_busy_traffic =3D tx_busy_traffic; + pmlmepriv->link_detect_info.rx_busy_traffic =3D rx_busy_traffic; + pmlmepriv->link_detect_info.higher_busy_traffic =3D higher_busy_traffic; + pmlmepriv->link_detect_info.higher_busy_rx_traffic =3D higher_busy_rx_tra= ffic; + pmlmepriv->link_detect_info.higher_busy_tx_traffic =3D higher_busy_tx_tra= ffic; + + return should_enter_ps; =20 } =20 diff --git a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c b/drivers/stagi= ng/rtl8723bs/core/rtw_ioctl_set.c index 587a87fbffeb..b190cb1392a0 100644 --- a/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +++ b/drivers/staging/rtl8723bs/core/rtw_ioctl_set.c @@ -61,9 +61,7 @@ u8 rtw_do_join(struct adapter *padapter) /* when set_ssid/set_bssid for rtw_do_join(), but scanning queue is empt= y */ /* we try to issue sitesurvey firstly */ =20 - if (pmlmepriv->LinkDetectInfo.bBusyTraffic =3D=3D false - || rtw_to_roam(padapter) > 0 - ) { + if (!pmlmepriv->link_detect_info.busy_traffic || rtw_to_roam(padapter) >= 0) { /* submit site_survey_cmd */ ret =3D rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0= ); if (ret !=3D _SUCCESS) @@ -113,9 +111,8 @@ u8 rtw_do_join(struct adapter *padapter) =20 /* when set_ssid/set_bssid for rtw_do_join(), but there are no desired= bss in scanning queue */ /* we try to issue sitesurvey firstly */ - if (pmlmepriv->LinkDetectInfo.bBusyTraffic =3D=3D false - || rtw_to_roam(padapter) > 0 - ) { + if (!pmlmepriv->link_detect_info.busy_traffic || + rtw_to_roam(padapter) > 0) { ret =3D rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL,= 0); if (ret !=3D _SUCCESS) pmlmepriv->to_join =3D false; @@ -374,13 +371,13 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *pad= apter, struct ndis_802_11_s res =3D false; goto exit; } - if (padapter->hw_init_completed =3D=3D false) { + if (!padapter->hw_init_completed) { res =3D false; goto exit; } =20 - if ((check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) =3D=3D = true) || - (pmlmepriv->LinkDetectInfo.bBusyTraffic =3D=3D true)) { + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING) || + pmlmepriv->link_detect_info.busy_traffic) { /* Scan or linking is in progress, do nothing. */ res =3D true; =20 diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rt= l8723bs/core/rtw_mlme.c index 98704179ad35..88242fcdf85f 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -1185,8 +1185,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) =20 spin_lock_bh(&pmlmepriv->lock); =20 - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 0; - pmlmepriv->LinkDetectInfo.LowPowerTransitionCount =3D 0; + pmlmepriv->link_detect_info.traffic_transition_count =3D 0; + pmlmepriv->link_detect_info.low_power_transition_count =3D 0; =20 if (pnetwork->join_res > 0) { spin_lock_bh(&pmlmepriv->scanned_queue.lock); @@ -1627,7 +1627,7 @@ static void rtw_auto_scan_handler(struct adapter *pad= apter) if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING) =3D= =3D true) goto exit; =20 - if (pmlmepriv->LinkDetectInfo.bBusyTraffic) + if (pmlmepriv->link_detect_info.busy_traffic) goto exit; } =20 @@ -1655,12 +1655,12 @@ void rtw_dynamic_check_timer_handler(struct adapter= *adapter) if ((adapter_to_pwrctl(adapter)->fw_current_in_ps_mode) && !(hal_btcoex_IsBtControlLps(adapter)) ) { - u8 bEnterPS; + bool should_enter_ps; =20 linked_status_chk(adapter); =20 - bEnterPS =3D traffic_status_watchdog(adapter, 1); - if (bEnterPS) { + should_enter_ps =3D traffic_status_watchdog(adapter, 1); + if (should_enter_ps) { /* rtw_lps_ctrl_wk_cmd(adapter, LPS_CTRL_ENTER, 1); */ rtw_hal_dm_watchdog_in_lps(adapter); } else { @@ -2517,8 +2517,8 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter,= struct xmit_frame *pxmitfr struct pkt_attrib *pattrib =3D &pxmitframe->attrib; 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.link_detect_info.tx_busy_traffic =3D= =3D false)) */ + if (bmcst || (padapter->mlmepriv.link_detect_info.num_tx_ok_in_period < 1= 00)) return; =20 priority =3D pattrib->priority; diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/stagin= g/rtl8723bs/core/rtw_mlme_ext.c index ac49bfbaa5bb..54b4fe2a2072 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -1523,7 +1523,7 @@ unsigned int OnDeAuth(struct adapter *padapter, union= recv_frame *precv_frame) if (ignore_received_deauth =3D=3D 0) receive_disconnect(padapter, GetAddr3Ptr(pframe), reason); =20 - pmlmepriv->LinkDetectInfo.bBusyTraffic =3D false; + pmlmepriv->link_detect_info.busy_traffic =3D false; return _SUCCESS; } =20 @@ -1575,7 +1575,7 @@ unsigned int OnDisassoc(struct adapter *padapter, uni= on recv_frame *precv_frame) =20 receive_disconnect(padapter, GetAddr3Ptr(pframe), reason); =20 - pmlmepriv->LinkDetectInfo.bBusyTraffic =3D false; + pmlmepriv->link_detect_info.busy_traffic =3D false; return _SUCCESS; =20 } @@ -4775,9 +4775,9 @@ static void rtw_mlmeext_disconnect(struct adapter *pa= dapter) =20 timer_delete_sync(&pmlmeext->link_timer); =20 - /* pmlmepriv->LinkDetectInfo.TrafficBusyState =3D false; */ - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 0; - pmlmepriv->LinkDetectInfo.LowPowerTransitionCount =3D 0; + /* pmlmepriv->link_detect_info.TrafficBusyState =3D false; */ + pmlmepriv->link_detect_info.traffic_transition_count =3D 0; + pmlmepriv->link_detect_info.low_power_transition_count =3D 0; =20 } =20 diff --git a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c b/drivers/staging= /rtl8723bs/core/rtw_pwrctrl.c index 0ef788abf403..5fab7b32d4d4 100644 --- a/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +++ b/drivers/staging/rtl8723bs/core/rtw_pwrctrl.c @@ -210,7 +210,7 @@ void traffic_check_for_leave_lps(struct adapter *padapt= er, u8 tx, u32 tx_packets } =20 } else { /* from rx path */ - if (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 4/*2*/) { + if (pmlmepriv->link_detect_info.num_rx_unicast_ok_in_period > 4/*2*/) { if (adapter_to_pwrctl(padapter)->bLeisurePs && (adapter_to_pwrctl(padapter)->pwr_mode !=3D PS_MODE_ACTIVE) && !(hal_btcoex_IsBtControlLps(padapter))) diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rt= l8723bs/core/rtw_recv.c index e893cb6fa273..82f5061432e0 100644 --- a/drivers/staging/rtl8723bs/core/rtw_recv.c +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c @@ -680,10 +680,10 @@ static void count_rx_stats(struct adapter *padapter, = union recv_frame *prframe, sz =3D get_recvframe_len(prframe); precvpriv->rx_bytes +=3D sz; =20 - padapter->mlmepriv.LinkDetectInfo.NumRxOkInPeriod++; + padapter->mlmepriv.link_detect_info.num_rx_ok_in_period++; =20 if ((!is_broadcast_ether_addr(pattrib->dst)) && (!is_multicast_ether_addr= (pattrib->dst))) - padapter->mlmepriv.LinkDetectInfo.NumRxUnicastOkInPeriod++; + padapter->mlmepriv.link_detect_info.num_rx_unicast_ok_in_period++; =20 if (sta) psta =3D sta; diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index 1ab1937fa2d7..959cbb4a194e 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -1391,7 +1391,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->link_detect_info.num_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..9c84f4cf1dda 100644 --- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c +++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c @@ -167,7 +167,7 @@ static u8 halbtcoutsrc_IsWifiBusy(struct adapter *padap= ter) if (check_fwstate(pmlmepriv, WIFI_ASOC_STATE) =3D=3D true) { if (check_fwstate(pmlmepriv, WIFI_AP_STATE) =3D=3D true) return true; - if (pmlmepriv->LinkDetectInfo.bBusyTraffic) + if (pmlmepriv->link_detect_info.busy_traffic) return true; } =20 @@ -364,9 +364,9 @@ static u8 halbtcoutsrc_Get(void *pBtcContext, u8 getTyp= e, void *pOutBuf) case BTC_GET_U4_WIFI_TRAFFIC_DIRECTION: { struct rt_link_detect_t *plinkinfo; - plinkinfo =3D &padapter->mlmepriv.LinkDetectInfo; + plinkinfo =3D &padapter->mlmepriv.link_detect_info; =20 - if (plinkinfo->NumTxOkInPeriod > plinkinfo->NumRxOkInPeriod) + if (plinkinfo->num_tx_ok_in_period > plinkinfo->num_rx_ok_in_period) *pU4Tmp =3D BTC_WIFI_TRAFFIC_TX; else *pU4Tmp =3D BTC_WIFI_TRAFFIC_RX; diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/stagi= ng/rtl8723bs/hal/rtl8723bs_xmit.c index abb6fdfe7e1f..1af9b922b4bc 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c @@ -202,7 +202,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, st= ruct xmit_priv *pxmitpriv =20 if ( (check_pending_xmitbuf(pxmitpriv)) && - (padapter->mlmepriv.LinkDetectInfo.bHigherBusyTxTraffic) + (padapter->mlmepriv.link_detect_info.higher_busy_tx_traffic) ) { if ((phwxmit->accnt > 0) && (phwxmit->accnt < 5)) { err =3D -2; @@ -482,7 +482,7 @@ s32 rtl8723bs_hal_xmit( (pxmitframe->attrib.ether_type !=3D 0x888e) && (pxmitframe->attrib.dhcp_pkt !=3D 1) ) { - if (padapter->mlmepriv.LinkDetectInfo.bBusyTraffic) + if (padapter->mlmepriv.link_detect_info.busy_traffic) rtw_issue_addbareq_cmd(padapter, pxmitframe); } =20 diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging= /rtl8723bs/include/rtw_mlme.h index 2a128568c6df..3cec80135fcd 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -93,18 +93,25 @@ struct sitesurvey_ctrl { }; =20 struct rt_link_detect_t { - u32 NumTxOkInPeriod; - u32 NumRxOkInPeriod; - u32 NumRxUnicastOkInPeriod; - bool bBusyTraffic; - bool bTxBusyTraffic; - bool bRxBusyTraffic; - bool bHigherBusyTraffic; /* For interrupt migration purpose. */ - bool bHigherBusyRxTraffic; /* We may disable Tx interrupt according as= Rx traffic. */ - bool bHigherBusyTxTraffic; /* We may disable Tx interrupt according as= Tx traffic. */ + u32 num_tx_ok_in_period; + u32 num_rx_ok_in_period; + u32 num_rx_unicast_ok_in_period; + bool busy_traffic; + bool tx_busy_traffic; + bool rx_busy_traffic; + + /* For interrupt migration purpose. */ + bool higher_busy_traffic; + + /* We may disable Tx interrupt according as Rx traffic. */ + bool higher_busy_rx_traffic; + + /* We may disable Tx interrupt according as Tx traffic. */ + bool higher_busy_tx_traffic; + /* u8 TrafficBusyState; */ - u8 TrafficTransitionCount; - u32 LowPowerTransitionCount; + u8 traffic_transition_count; + u32 low_power_transition_count; }; =20 /* used for mlme_priv.roam_flags */ @@ -171,7 +178,7 @@ struct mlme_priv { =20 struct ht_priv htpriv; =20 - struct rt_link_detect_t LinkDetectInfo; + struct rt_link_detect_t link_detect_info; struct timer_list dynamic_chk_timer; /* dynamic/periodic check timer */ =20 u8 acm_mask; /* for wmm acm mask */ diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/st= aging/rtl8723bs/os_dep/ioctl_cfg80211.c index 60edeae1cffe..74aa7455311a 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c @@ -1231,7 +1231,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy goto check_need_indicate_scan_done; } =20 - if (pmlmepriv->LinkDetectInfo.bBusyTraffic =3D=3D true) { + if (pmlmepriv->link_detect_info.busy_traffic) { static unsigned long lastscantime; unsigned long passtime; =20 diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/= rtl8723bs/os_dep/os_intfs.c index 6ca6dc548805..92b94bebd7f2 100644 --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c @@ -610,11 +610,11 @@ void rtw_reset_drv_sw(struct adapter *padapter) padapter->xmitpriv.tx_pkts =3D 0; padapter->recvpriv.rx_pkts =3D 0; =20 - pmlmepriv->LinkDetectInfo.bBusyTraffic =3D false; + pmlmepriv->link_detect_info.busy_traffic =3D false; =20 - /* pmlmepriv->LinkDetectInfo.TrafficBusyState =3D false; */ - pmlmepriv->LinkDetectInfo.TrafficTransitionCount =3D 0; - pmlmepriv->LinkDetectInfo.LowPowerTransitionCount =3D 0; + /* pmlmepriv->link_detect_info.TrafficBusyState =3D false; */ + pmlmepriv->link_detect_info.traffic_transition_count =3D 0; + pmlmepriv->link_detect_info.low_power_transition_count =3D 0; =20 _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING); =20 --=20 2.52.0 From nobody Sun Feb 8 17:37:15 2026 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 5AE3E3A2AFE for ; Thu, 22 Jan 2026 16:48:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769100518; cv=none; b=fKP34gA87PC3t27ApeIPj1/gIeI++gPijfnZFHowVlbULLJUZtm20SpTLnvf5diAz94lVPXR8483b2q0pGJ9P54rjIxaaPc+s88SfWmtRIuHwIQCSch1RBM4/bXsU9R1ORgJc0J7dS+b2oeu1zspE+5ot+jU/fJh5F27Zw0Lr+k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769100518; c=relaxed/simple; bh=wMn5OodQiuyuzlqSG0KT3UKtvO1RoYKdkyBLbhWAn0M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=p/zhQoDxNpbBQrXR+wJwWSyrYFVMxQ8JkJk7SHv4gx3pQ4fGPCdg7z/JftQNDLFLUtGHMG8aG12vXkTxIkHii609NyWvEiGghjnIDPl3Cn8t0Nc0yfkNoSbu9TlhGXv2XkM/IrATCeyz6GoB86z2x67jjqKziOlY2WaKomnoQk8= 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=FQhAYboF; arc=none smtp.client-ip=209.85.214.178 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="FQhAYboF" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2a7a23f5915so8208405ad.2 for ; Thu, 22 Jan 2026 08:48:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769100503; x=1769705303; 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=y0BDRr2yeABBk83iQGJ24rP8MmGcDKpsrsYXgQ2ZdRI=; b=FQhAYboFUoqEW8BLEpslszErJx+ijkQMd/JFkIRAAVSUUL5VAcih91tm8M8AHzQBJD wgTdveeUhybkjHBOvuUs+c2rEjnoSdauKCMPC9sNoNb67I3A2y5nBlSygReJaPqBcgXu yIXLiz8T2H/qeKRVzmPrAoWCO3DZczk5H0LPfYO6BKKl5/5zkBuPMFSNy225UREjLhvt FckZs96XKwnXY/Q9bUCzSJsC4WxbTQn8tnLE/q7pnGgVu8VUG9LPlpcw8zZptXEmvTk3 LRmX2Ak86fNSryJnbdX+RZ6Ebt1lvYHyA/ao81zXXM1n+LmZ4R8ENw8JtcBK8K6fa4T7 AmLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769100503; x=1769705303; 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=y0BDRr2yeABBk83iQGJ24rP8MmGcDKpsrsYXgQ2ZdRI=; b=T7GjPT9OjbE0yjVE3qWn5yKJ32yYa9mM0DbZHFQ/bNRUHx0Sglnaus824LeBPZvTuE 1JvIb+SvNgMJJ4Y5M7sRMQZ2TNwmrVZvjspY+F6ZGYxU45Wm0K8VOTOc718BpLhFA4DJ p3dpox/CeTdWYgAkCCroZhII200h7ktIsR6bdhJ5sZHvvifVpK0AebeVv/WMOiZEFQ9F PmgcpoSir3ZsCQAtcO5pJj62C028W2DxF5GLrJ4niNNZ39EkY+QO+Sv6sbfX4TtrINRq jp56cItKoCMgJnWDiaO74VMHyDKruCuAXhyF30TzMbT0NT8fvdzz+mlzO1dL1jnzdcTb jCfQ== X-Forwarded-Encrypted: i=1; AJvYcCVlVq3cZWC1h3xSgvkKHpBJQDwBMNv458XqQd5Ck/2abA8aUsuyqooiobppGrVLuAowm/NB16UeLwCnL0Q=@vger.kernel.org X-Gm-Message-State: AOJu0YzA3vU9CIEmwVt/nzMGlS9pfubbPoVom2P21rqO+nly06DYw8XW nlIsUCzn6k9E9YMx/3/OpO07fExO/u1pkfq5Oy68gRlXuvYvVK8CWZsJ X-Gm-Gg: AZuq6aLFTgTche6qzyIMkAPDO6Y03ZC0uMMwSgNVCaSv0WVPK7bOWLxq9fn+4t5qyGo mIksCLsA6CzUEAOBju9PvgTsE7R1SY9XYOW6SnOuQZngA+Jl4W93fg2ndXzF1XFh0LOmPGcfbm9 SPvGQW+uU2QyB60gq1rBU0V2UMWAsjMupxDkTzI6/utaxgEjiyaK7UHmhj+jjALua5PACEsGE07 aIvMomrJldDyRxYh/57HV6sLwI7t0w+GWmFj9rV1IyAgYpwoK1FkxV1lo/9jiC4phKQ71sDD2+Q fH5rPVyYPxh5XQ5wgiNJnWzf3LbXiD8c8gyAPPjw9alcs+Ftm12el7t0aCOrKcqFXKju0XswEWI +V4axRabsRCTAkb3hizaEWb6yDEhFGHLqwxccJm1ieh/JZGvtsCp+ISHYEt/7KR0ctF3NfgX1e8 6YVQgKaXQpYOHN5uqibdNTj9QVwUp27b3Cajg= X-Received: by 2002:a17:902:e808:b0:2a1:10f6:3c1 with SMTP id d9443c01a7336-2a7fe5ad605mr503465ad.26.1769100502601; Thu, 22 Jan 2026 08:48:22 -0800 (PST) Received: from snowman.bbrouter ([43.241.121.48]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a7193dd523sm189986225ad.62.2026.01.22.08.48.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jan 2026 08:48:22 -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 v4 3/3] staging: rtl8723bs: fix line length and alignment issues Date: Thu, 22 Jan 2026 22:17:51 +0530 Message-ID: <20260122164751.37796-4-khushalchitturi@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260122164751.37796-1-khushalchitturi@gmail.com> References: <20260122164751.37796-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: v3 -> v4: Adjusted comment formatting. v2 -> v3: Resubmitted as a versioned series to resolve threading confusion. v1 -> v2: No changes. drivers/staging/rtl8723bs/core/rtw_xmit.c | 107 +++++++++++++--------- 1 file changed, 66 insertions(+), 41 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rt= l8723bs/core/rtw_xmit.c index 959cbb4a194e..fbe03cfbf3e6 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++; } @@ -366,10 +376,12 @@ static void update_attrib_vcs_info(struct adapter *pa= dapter, struct xmit_frame * else /* no frag */ 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. */ - /* Other fragments are protected by previous fragment. */ - /* So we only need to check the length of first fragment. */ + /* (1) RTS_Threshold is compared to the MPDU, not MSDU. + * (2) If there are more than one frag in this MSDU, only the + * first frag uses protection frame. Other fragments are + * protected by the 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) { if (sz > padapter->registrypriv.rts_thresh) { pattrib->vcs_mode =3D RTS_CTS; @@ -436,7 +448,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 @@ -464,7 +477,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; @@ -472,7 +486,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; @@ -511,7 +526,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 _WEP104_= ) && + pattrib->ether_type =3D=3D 0x888e) pattrib->encrypt =3D _NO_PRIVACY_; } =20 @@ -563,7 +579,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; @@ -655,8 +671,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 */ - /* to prevent DHCP protocol fail */ + /* The following is for DHCP and ARP packets, we use cck1M to tx these + * packets and let LPS awake some time to prevent DHCP protocol fail + */ =20 u8 tmp[24]; =20 @@ -665,8 +682,8 @@ static s32 update_attrib(struct adapter *padapter, stru= ct sk_buff *pkt, struct p pattrib->dhcp_pkt =3D 0; 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))) { + if ((tmp[21] =3D=3D 68 && tmp[23] =3D=3D 67) || + (tmp[21] =3D=3D 67 && tmp[23] =3D=3D 68)) { /* 68 : UDP BOOTP client */ /* 67 : UDP BOOTP server */ pattrib->dhcp_pkt =3D 1; @@ -777,7 +794,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 @@ -997,10 +1015,10 @@ 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))); + 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); } =20 /* @@ -1030,7 +1048,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 @@ -1151,7 +1170,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; @@ -1234,7 +1254,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 @@ -1248,11 +1268,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) @@ -1409,7 +1429,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 @@ -1430,7 +1450,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; @@ -1767,7 +1787,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 @@ -2021,7 +2042,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; @@ -2116,7 +2138,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 @@ -2136,7 +2159,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; @@ -2157,7 +2181,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--; @@ -2462,9 +2487,9 @@ struct xmit_buf *dequeue_pending_xmitbuf_under_survey= (struct xmit_priv *pxmitpri =20 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)) { + if (type =3D=3D WIFI_PROBEREQ || + type =3D=3D WIFI_DATA_NULL || + type =3D=3D WIFI_QOS_DATA_NULL) { list_del_init(&pxmitbuf->list); break; } --=20 2.52.0