From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f65.google.com (mail-dl1-f65.google.com [74.125.82.65]) (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 9BA9530E0C0 for ; Sun, 14 Jun 2026 18:23:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.65 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781461404; cv=none; b=siU7gUkztIPw1c2J7GpwEciVSWAUAGkdM1wRz1spHS82OFDwhGDLUg0HEKnOHonHfxXWn75u/3iOlfFizp0+v8bW1fmOlUxEXxyJ8gMXWLq4xIJQUWbw+2c3AgUlQWA8suwqpSrB6xiZ9tcZJraCjvpA85e1k+AIG7eOCXJWv8M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781461404; c=relaxed/simple; bh=LSxmJsRhqENT5wVxzflqb7UNcZeK9p/EwzaMh/cRNP8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Dy+phlfg316x2Ag/68rjmN9CDeS/MTi2JMiSxpykj2GK/CbIhDfY4VJWcIWbNTfwTeVcxRdo1uYOEtVBDAJoEoBeYP8qh7Hjtr9aoK4dX4KLmjjqEVhE3z1BNS5d9q9WX3aFL/1ynTyIYixcfM/SePISM7LJvVuYGTX7bKkZiW0= 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=NyWAUv0+; arc=none smtp.client-ip=74.125.82.65 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="NyWAUv0+" Received: by mail-dl1-f65.google.com with SMTP id a92af1059eb24-1370417c01cso3187150c88.1 for ; Sun, 14 Jun 2026 11:23:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781461403; x=1782066203; 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=z07ARaiMz6B0ZS7K3wv0bi+xVX8dJjXDhpIS7KELAP8=; b=NyWAUv0+Zej0VrURcOY39Wi4UBb3lQGqE7GfrBNANyWqZel12cL3cAIjBvkXqQJ1OT P7qQDctZWmuUPUwSFrzjyDSuttMHsgiyyE/29GyVacNqQOA1CLtudX1PIqiK5vt+yLsd ixxmUevuUsT4xM+sEkMBdML6IWzP4WHxMETl5fT15V9/1zq4smCVBGRjwftxQ5GdwkWe gqlcwX++KNwk9A3wagegfBFhrHx2WTOgcj6yJfbG7s0Zx+mQZTuREpQk7krSpzrIEJei 4GMhFFr7BtB+12fotlczCSq6bXxpaDVr6it3DEMxzXmZ7kiwhbcYRhLxjacu8WRD2ufP h6+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781461403; x=1782066203; 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=z07ARaiMz6B0ZS7K3wv0bi+xVX8dJjXDhpIS7KELAP8=; b=erBIAdSlthZnx7pRdTCjE/saW/C+P01p5FdNdbn1NoLdkdnaxTdb7jXSW+0GPIutpH sTuijC/L6V5tAY3KfQHUgeabT2O7/7nxFnAyqibC9DL4T+YT3LKwhdnhnc2RoIF8kjjL qT3txDYS19CIHJ8axg6L/6NPXDjNEqui+fyKTqehCgLEDFzTWV1dnJlUwzqdmpV9gMOW MToWSU3OCATdk84wCXvJm/uNlPVRW8RjMrvuQWlSQ91PTiNSAqeUtN8z+Pkq3yKww8c0 J6H0jjtwhuL/i3DFukyde+QQSESj7i178Wxp+iCfj8FmXr5S30EbRoNvAzh+YsV1Slya NW7Q== X-Forwarded-Encrypted: i=1; AFNElJ93yfCrjPVEIJzMtM4D0S+4vCTSgMt5otuBeNZNnYS28DfEjpOS4ySClDRjo5s40LYn1saVsn5JhW4sZIA=@vger.kernel.org X-Gm-Message-State: AOJu0Yxhk68tQGYPjoZVREJnDho1fzTJPTTak58VR3sBqJyyOT1eH93m P6BQZRXd/XddlODxYvpTXBYyOLYfBw/kozSu8/PL+ut3EHt/+noCdro45hLlZRs5v0c= X-Gm-Gg: Acq92OF3bnAVpx9ZVfYjgSN97uVJYo0B4UfXyi5QfA/hnr1SZvVaVEtOxXTpL84Q63w 3F9UQLHIzOhpIu7ygEnrB6+cD2EIhCBEZFu2tb4LxwDFbsOS3NHXv2BWEGDBL8nH63nWavnbhmD cQjbQgE9dkagLVKPB0LVE0/6XdKalTvjBNzQXZLAhPPGfEyR0Be/apuLIFheBvvqh/dr6iadFFM xWdhi/grcVHQ2VmZS8njjP943py9ildN71uIfddEdzQMwrkYn3lzcKQFjUBkLFAdZ+86SiIKuGX PK2C3BWVgkEWI1I+UFB+FyKOj0GT/mHxNnNnFl5PxIsXY1eNQuj1a30VAf3mCgURYA21a6kfAct aQYIaqSebEc71+3WipZd619x+diLBsnHSBMQ8kCv2WNPWrlPkCv0V0923xnRcB77SIxGtdjoskB 7vV6cMY5x/zFTKV4sb6ojKnnfYMjbnuS3pSFm9yVBPyl3T0EY7q5x+NxE= X-Received: by 2002:a05:7022:692:b0:138:43f1:e48b with SMTP id a92af1059eb24-1384bbb6ba0mr4959401c88.17.1781461402685; Sun, 14 Jun 2026 11:23:22 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1384b975e55sm8435022c88.13.2026.06.14.11.23.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Jun 2026 11:23:22 -0700 (PDT) From: Hungyu Lin To: gregkh@linuxfoundation.org Cc: error27@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Hungyu Lin Subject: [PATCH 1/4] staging: rtl8723bs: simplify update_attrib_sec_info control flow Date: Sun, 14 Jun 2026 18:23:06 +0000 Message-Id: <20260614182309.96110-2-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260614182309.96110-1-dennylin0707@gmail.com> References: <20260614182309.96110-1-dennylin0707@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: 8bit Replace goto-based error handling with direct returns and remove the temporary res variable. No functional change. Signed-off-by: Hungyu Lin --- drivers/staging/rtl8723bs/core/rtw_xmit.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_xmit.c b/drivers/staging/rtl8723bs/core/rtw_xmit.c index 444966c0de7f..6ab91de472b0 100644 --- a/drivers/staging/rtl8723bs/core/rtw_xmit.c +++ b/drivers/staging/rtl8723bs/core/rtw_xmit.c @@ -507,7 +507,6 @@ static void update_attrib_phy_info(struct adapter *padapter, struct pkt_attrib * static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pattrib, struct sta_info *psta) { - signed int res = _SUCCESS; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct security_priv *psecuritypriv = &padapter->securitypriv; signed int bmcast = is_multicast_ether_addr(pattrib->ra); @@ -519,10 +518,8 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *p if (psta->ieee8021x_blocked) { pattrib->encrypt = 0; - if ((pattrib->ether_type != 0x888e) && !check_fwstate(pmlmepriv, WIFI_MP_STATE)) { - res = _FAIL; - goto exit; - } + if ((pattrib->ether_type != 0x888e) && !check_fwstate(pmlmepriv, WIFI_MP_STATE)) + return _FAIL; } else { GET_ENCRY_ALGO(psecuritypriv, psta, pattrib->encrypt, bmcast); @@ -560,10 +557,8 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *p pattrib->iv_len = 8; pattrib->icv_len = 4; - if (psecuritypriv->busetkipkey == _FAIL) { - res = _FAIL; - goto exit; - } + if (psecuritypriv->busetkipkey == _FAIL) + return _FAIL; if (bmcast) TKIP_IV(pattrib->iv, psta->dot11txpn, pattrib->key_idx); @@ -601,9 +596,7 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *p else pattrib->bswenc = false; -exit: - - return res; + return _SUCCESS; } u8 qos_acm(u8 acm_mask, u8 priority) -- 2.34.1