From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj2-f1.google.com (mail-pj2-f1.google.com [74.125.227.129]) (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 2BAAB3F411E for ; Tue, 7 Jul 2026 11:25:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.227.129 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783423537; cv=none; b=tff5QBGBxzmyBk8r54rWCvVh7v/cnSvBPOvMCOOTR4+U+l2vz2HQnZ9UpBq/1wN+kv4HtKU+HhRQR5RjhRyaISl5oHcw+TsKw2AWrXTPCHpKNYI16WibfIX3jtqE73IijPBKuapb4ebhmRHvDYAAjFcfwRSffGlzmPplDx4Jx50= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783423537; c=relaxed/simple; bh=BWhnoMByY8tlUDjvMcBDWxhqMvqW3vappDP793Yy5HU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mSVhSnRZ0b3l9w4mJTv9LhHSljk0A7Vc4F2t+AwCozPSiZ9pqTCuecYxBeFF5eE8HpzM9hcBDZzHrWdArGK5A2eYEdbcwcJqkrgEgu6o+xAnl0NqRoDRkI/W5MuGUb4M+axFuMro2K7msSqV2r/wvXmRWcxNPCVOu/B2/UUMpKM= 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=UyEKSI0v; arc=none smtp.client-ip=74.125.227.129 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="UyEKSI0v" Received: by mail-pj2-f1.google.com with SMTP id 98e67ed59e1d1-3821a6fbcdbso909282a91.0 for ; Tue, 07 Jul 2026 04:25:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783423534; x=1784028334; 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:content-type; bh=23UYfOtXBSiXwdJ5KRDbMy0SKO5+6XK2WJxF7MSTjcs=; b=UyEKSI0vAdC+mAuTiBw6C0T19Ya1UH16SDqf5gJjrcAHEYc0bOu44qcOWdtsEKvBEB xeQgYGH+H7MjXNpbY1n4qzzyL1uPldJjbI+OT8icX55odquJyMdiVmEvJghsAEzs5c7k eZHmaK2/jIvQh9Qg2E76Lx+2dCeax4NRYsrnKuQD3eiC8AhSas5XFQLoQguR8FY+FkeT XK5YOQXX27SNRigG4CcnFNF/iV+jHDapOGS2zmUgAz1X1igDBbrGrB6c0vkBcWAMgMlE 9LcGqqi/+5yRTaB+NvZAo0BaVUWewiufR3vmD5ZtMqnasZrLGIAOu8r+JDdOEJLt2LHw MkUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783423534; x=1784028334; 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:content-type; bh=23UYfOtXBSiXwdJ5KRDbMy0SKO5+6XK2WJxF7MSTjcs=; b=KQF1WhdXkEv8M1DrhEJ4P+F9bVZyIK/2LXjMZXStIgsc/6HlVh8gADcKrxV7ORfqRW fW5wcGzyO9mGfnPxgSe59QSbDuoWg7OuaZEfzqHqztPsTki8Oi1iwnKvcfsJgeXabJyG sraTTjF9Pf+4Bv9UoycJL3rQ5HudiPxETsZ168m4L3fz+0SIK4rPdSUJWE3QnfANu8ny Cy4jY8KqbRsUc7AEU8Hkj2YFxIxLdpxVvlItgxzH+29nXRCBV8nhajyHeIBL+r8kbBlJ bOzDbRhTeAKX/jnajQ/KwFFDplpGQ3PM6OZwodFahJp+3CW0Ykz4Xt5ZUL4uFWnIJthk 3nGQ== X-Forwarded-Encrypted: i=1; AHgh+RowM+/phYdbEidAkmZkHNAHhHU67j3JakJTexg4EBooPlzSxubpU/JF5iWSJ0iDkhAokLdXsb4n2wyKPTI=@vger.kernel.org X-Gm-Message-State: AOJu0YyKWJCeRmVAUHlcZ3/qDCHfV+IWdqO5zRSppCL+Jykkf/Y6DDaT W7GVsXlkgGjYBQM0umuSSCc1lpJd00VEeIBQXDl9Y6Utl3F9wS0DW8a6 X-Gm-Gg: AfdE7ckwr/Upsp3fH6RFvt3iwE9Bppox4+gG1ayU3sOXoCA/fu0LGyV0hYuGmww2bjC 8Iwubwj+pEGNjaWi6uUkM/BT9WYVNByZEd5+h6Y+BqPZaB0iWjrIYYpm46yRrIzCTfF5EXFT/cy OfbqaFlYiuYEI29tImpqGYzY/BdlTaaq/ed/wU8TH+jZrtWt/socvRk0q9v+pZjBc9ndTY6zgkY 67qYN5ujYP7GP7+gJON9kcAdjaUbL+ea1IE8eBscKB8osiFa1Ec5xcZOOJirxLfgpEEdyqWbAYn 6qpccc1mHrVWZa3mPSrnau/PkpHtifH9zgtHN/MBETsWstpf8Ul1O2KnHiVyaJfeL8uXbrqylGT www2f5cBc9xOs6urDQj4JWEMIsZjZ/gXZ4lkPCzynt/m2s17QaFn4uW8Dc9iXwSvS87DHKDkdRV Lx1KhYZwnBjhU39f+Oj0ZLR9yLIPtuQe69RONMwji9XPyB X-Received: by 2002:a05:6a20:4311:b0:3bf:d0c8:2a8b with SMTP id adf61e73a8af0-3c08ece2de6mr5315885637.20.1783423533864; Tue, 07 Jul 2026 04:25:33 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13b65960d88sm6548721c88.6.2026.07.07.04.25.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 04:25:33 -0700 (PDT) From: Hungyu Lin To: gregkh@linuxfoundation.org Cc: error27@gmail.com, khomenkov@mailbox.org, khushalchitturi@gmail.com, s9430939@naver.com, marcosandrade95963@gmail.com, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Hungyu Lin Subject: [PATCH v4 1/4] staging: rtl8723bs: simplify update_attrib_sec_info control flow Date: Tue, 7 Jul 2026 11:25:00 +0000 Message-ID: <20260707112503.612-2-dennylin0707@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260707112503.612-1-dennylin0707@gmail.com> References: <20260707112503.612-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.43.0