From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f194.google.com (mail-dy1-f194.google.com [74.125.82.194]) (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 2058F481246 for ; Tue, 16 Jun 2026 23:52:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.194 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781653981; cv=none; b=WetD0iIZreP2L1nYhGBhqKuAPYluHChiEPHTxMvguhALNB1bei0w1tHRZzDtwFTdftni1PQn4YorJnOfenXsx+lGmHvUgcb5C7Vz4XeFD9R1z8VqvkA9R1Tthxvwfr68YqUWoJK38TMOD+JDNDhAKzkJQi+lAxM/I05rC653bxM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781653981; c=relaxed/simple; bh=LSxmJsRhqENT5wVxzflqb7UNcZeK9p/EwzaMh/cRNP8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dutZbAWNDU9b2QUh5hjVyOd7c1X6fMLDjZ+ssWFXSMd/tT6IgjM11OXva7FeoOkGtNJZPvnM0i708i153u5L5tf0KjhFKMifsolRChLwKJNgxO7XbKNXpicLe4bL0wTz3A6kwC6XeQroa7lGYKlM0Q1aYSzs2CLl4gYw7aZ5VEg= 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=QsqYxOd1; arc=none smtp.client-ip=74.125.82.194 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="QsqYxOd1" Received: by mail-dy1-f194.google.com with SMTP id 5a478bee46e88-30bcf74e617so432378eec.1 for ; Tue, 16 Jun 2026 16:52:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781653979; x=1782258779; 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=QsqYxOd15ZoezuajY8N2zJXniHMsut7/yJ68Ro+wUxwCEcBPktDV+vIsXaDoAyieKk 60aydN9KZoj4MkZZW6DaMTExtfrnJNpMDSAbZ16wVD/Is1ZOIlGqU2etY5ncv3hqvkMz +bQPXwowwZaccIcA58SIsuSk5WqN0oKdr8wu/uE1H/jDYebogIVOXcDaYHUOhM+CReKr Riq2q3lO9fQtz+CdniYaT/dkdFAjiv6517HAu5By8G1Lz7byVcTovqt58Py6A77J7La5 z7Dci3qEIBSEp8Dk0AfZHNtntXm1hyy0IC5pP0m6+WP6hl0JXzfF3AvPLO9v3Zn7OLqV CbOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781653979; x=1782258779; 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=P7oua2lfkKk7wqe4OKpEfH+wD/p5K5heAvxntFwrD4DtJiqHZjHDgCsXTT/IY2zAG8 3XVrnonypQhiEhEuFG6FEpsS/IeS+j9m6iPiOJ6bXpX088grl9qiXmnVvLnHqI8e65bp FEvj2Om92LbE09bNXxJ1hkCeOCF9Zg9EiR1662hODJgfgK9ATh20SNWhT3hmQB08mXkL oxcGFLShGHfg9/Rm+jTh58dZWKkA7UzWQ4d2e6b24HX0FkDiefK1mqosqthzza2+gyr6 o2GYgm5Kl6VnBwXmZT2TP6DklRwX4JYpXZNXOmtzQTB8eXzap8DE/q35fxgDGEspV8+t 8nLw== X-Forwarded-Encrypted: i=1; AFNElJ+Rd0b84HsIsObXi+Q+wfWOWyWALKb8G4hcdvchmNr+T5JT8hwJY7ETYl7o/nRFsLdpGMJJx4ZPb0k+Yf0=@vger.kernel.org X-Gm-Message-State: AOJu0YxiwnTlt5sfYABkQovzpDlwR+JMaLeIbyPv9urYyZi5DM1BZeFj r3Kj4b8wcF8dYjTh+j1UGc7KTZwVTvroGXmjXLEfARBL+V/MHnRIp0zi X-Gm-Gg: AfdE7cldnlWXaT64JYZRMtqu519dSk8Uv9bZCXMtpM6jxUV0Z72KGxGYHJGlv8GfzvX J8axczcsOhaH1YYHXm5EG/yw3t+Oj6fH1aSiv/Zr8fzOSB4sUSI3xqQuMuZzDzg7HEjWw8T43Rn 9FuDSGVQ0GkfBVYFlmHrj/f2d0bW0+THVXNbKA4WKzMdeUDtqESmfw0iuIzvLwi5P8gU5kkLqIQ sr3Z6RoKU+RwZcVTYvWrEMje/tAnOXgMmwvyTrKBb+Tfj1ej6SdBj+sW7bGqob7tPoxa0Bajoa2 A3uENRrpfFX/NaThjq5KK1NvbjTpHkbwhtfha4ZAI6smZFSog8llplnMjS1FF4hKf1qXIaqkCpY uRlvA6e9oFrHMml2rgWryvmoZIrt+9oWD4DTObNOD98kjf0ducrQT63dmPzCVJSykJQI+A1/UiI fdluBsyDgdQ65icHusq+YFERK+SyqmgzX24yl/ZHpLgofyllMQOd4zPzo= X-Received: by 2002:a05:7300:ec17:b0:304:e20e:f5c9 with SMTP id 5a478bee46e88-30bca224971mr933065eec.31.1781653979176; Tue, 16 Jun 2026 16:52:59 -0700 (PDT) Received: from localhost.localdomain ([76.32.119.210]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3081e5d3f20sm20208153eec.9.2026.06.16.16.52.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2026 16:52:58 -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 v3 1/4] staging: rtl8723bs: simplify update_attrib_sec_info control flow Date: Tue, 16 Jun 2026 23:52:38 +0000 Message-Id: <20260616235241.99076-2-dennylin0707@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260616235241.99076-1-dennylin0707@gmail.com> References: <20260616235241.99076-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