From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) (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 863482DB7AE for ; Tue, 13 Jan 2026 21:14:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.193 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768338896; cv=none; b=j8fsy805Xh19sg5aB+KffAv/x36ODdsd6SikPjkS6xKs/0mE6d/PGdd04rSM61Z4+85GnW9/rmDmma8CCn/jqPVX965XaOdbLcBgii+7tmuCwDY1I6CmAGigaztzyzgP1Yjot307PxEos8Q81U9HCz0d0/lT7/Bnbz1uZISMe1c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768338896; c=relaxed/simple; bh=lAFQ4cjclz+FBZQ/H9cSzFhDS/3VGgND9xpcwjTR3m8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=MXdsXV25RDZMxBsHePFhuB/ZB6PkTOuSvFZ/1JcoV3vOFCMJvCzWL5vKnPUJPpvbrjSGKPbCM6NC7e2Dnian0jj9vV2rR5YGRtKlhXPi7K+QqwsEw4czNAp2T7fgS9plx6ffDTQhoPhGdoClxaKWIu1dkQsJtcT1kFlr+srEU1w= 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=aobMsKcQ; arc=none smtp.client-ip=209.85.222.193 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="aobMsKcQ" Received: by mail-qk1-f193.google.com with SMTP id af79cd13be357-8bb6a27d407so781088385a.0 for ; Tue, 13 Jan 2026 13:14:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768338892; x=1768943692; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=PWtqfEivecHDI5yuAWKVCsH+keTo7LlgFYh4MWGjuBQ=; b=aobMsKcQuzUzML/V6pBCYsYHYOBXc1UaTrBR7JzgXejFUFpQf6lRqCd8P96u0k2FP8 GrNe4a98/6RIAd64U7PGrHo1FZTtJNP50BsjsZpv3CEECmFkiMKsK1phCUZf1J5lKivN 2UhgdpzsubsntMbRyGJrTACGU5+LYJJxlYXpuI+owb8tcaMb/fFSMZahFVxC6NeDvR4X qW/sxmQ82yJOpF0/iTjKJJEI50dy5xnLFS1j7R/HsFpbyHk5c1eEfE+/B7RRJauNDCTr 1DRMPY2yygH1avNRhETYLQowNyWszKNMuliGF/nwrkiXQ2m87k2YIvpZzl0ZzWb94xjA 0iIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768338892; x=1768943692; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=PWtqfEivecHDI5yuAWKVCsH+keTo7LlgFYh4MWGjuBQ=; b=wSeKtnoiko9IfcWO44RhpxuElgGmnCFDXy5NP6oH4ZVkvr9ItHG5ZVlzfay0Kx0Qq4 brHs1lwEhD8mSaeVxVad5nnNJyknmiu8TahHpw6lOnzAT8jK77dP+yr8TxRff3I5NVVR VKXKZHp1GTAX4u+FizVo0RUgktCBHHfqQL86lixdrcUtcgTb7qUEadjXklKzCvwf/TIt xS3w2U9vuBr2t/ilMUWoxjJQQugJNzGSeFgkpA/CmD7hlVKOE+FgIoR0kOa2peSn/O4Y 4i+AQpa9f0Xu+wkYIaGoixcESUFI7UAtR9SCz2WHnIukWgURAnljuY8RZhkd+aEEw5Pa 7rOQ== X-Forwarded-Encrypted: i=1; AJvYcCXcuhFpOxUZ0f4dUf5spebcYz4Ud5mNrAzsSU5fwjsWjSa3F/MsuSweU9rV1sRtKVaj9ZbE+oR+y2zdKX8=@vger.kernel.org X-Gm-Message-State: AOJu0YynPMmOuD0JB0ClmBm9j7gTSIAHTl9LaG/fZ2lLTJClJTH5kTnl N/P1vPKru+WirPgYkjILRKF3vHR84DzpK8JAgMX+Dm2QV+c5PVATpTZi X-Gm-Gg: AY/fxX4Ep36OnuGQcTHlzbWx7KHHIaKKK7uQw06k/kBYGt0zB50v62cOekzPs3VaTCc 1J5qXQFNAvhHEYYpLiI0MQ884fPMn2kIKplZWvJyu2N2E+9bl7TNhusgyp/gDnbG0aFcjse8mxV zYYZzJWkPhCQXNtTsbTs3r5gZNTg1E8XrnFrwSrkcMwm10Ylhg3R9JmlgDlvsmxKtW+rcDiYoms gZtdx16rgPid5r+A525O+vFi1RsJXjrMmeoQhKZh7qpFyYD4COroR+NThxRW29X4ILslrBGCvGU C6s1HL4CJPTlA2PhwJ28iTYm+enWsvkNYg6Lb9AYahiAUO88F4eujwF/xRa3v/mPXz1FHG8zC62 uK9yiowkgkSHuTnnuXCMS6aUGexXUJY/m19hUiDYoj4H9bpCBIV7U/uznYk1773BDYHliKnE6oC /hHFOg5/pDpp4EG/0P2EMobg== X-Received: by 2002:a05:620a:1a13:b0:8b2:ed01:b65b with SMTP id af79cd13be357-8c52fbffa77mr85335385a.83.1768338892548; Tue, 13 Jan 2026 13:14:52 -0800 (PST) Received: from localhost ([198.1.209.214]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8c530b74bc4sm12449285a.32.2026.01.13.13.14.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Jan 2026 13:14:51 -0800 (PST) From: William Hansen-Baird To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, William Hansen-Baird Subject: [PATCH 1/2] staging: rtl8723bs: core/rtw_mlme_ext.c: flatten control flow in OnAssocReq() Date: Tue, 13 Jan 2026 16:14:32 -0500 Message-ID: <20260113211433.89512-1-william.hansen.baird@gmail.com> X-Mailer: git-send-email 2.52.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Rewrite if-else construct with an early exit to reduce indentation, and make the execution clearer. Signed-off-by: William Hansen-Baird --- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 59 +++++++++---------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c index ac49bfbaa5bb..d3b395894d4b 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c @@ -1181,47 +1181,46 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) p = pframe + WLAN_HDR_A3_LEN + ie_offset; ie_len = 0; for (;;) { p = rtw_get_ie(p, WLAN_EID_VENDOR_SPECIFIC, &ie_len, pkt_len - WLAN_HDR_A3_LEN - ie_offset); - if (p) { - if (!memcmp(p+2, WMM_IE, 6)) { + if (!p) + break; - pstat->flags |= WLAN_STA_WME; + if (!memcmp(p+2, WMM_IE, 6)) { - pstat->qos_option = 1; - pstat->qos_info = *(p+8); + pstat->flags |= WLAN_STA_WME; - pstat->max_sp_len = (pstat->qos_info>>5)&0x3; + pstat->qos_option = 1; + pstat->qos_info = *(p+8); - if ((pstat->qos_info&0xf) != 0xf) - pstat->has_legacy_ac = true; - else - pstat->has_legacy_ac = false; + pstat->max_sp_len = (pstat->qos_info>>5)&0x3; - if (pstat->qos_info&0xf) { - if (pstat->qos_info&BIT(0)) - pstat->uapsd_vo = BIT(0)|BIT(1); - else - pstat->uapsd_vo = 0; + if ((pstat->qos_info&0xf) != 0xf) + pstat->has_legacy_ac = true; + else + pstat->has_legacy_ac = false; - if (pstat->qos_info&BIT(1)) - pstat->uapsd_vi = BIT(0)|BIT(1); - else - pstat->uapsd_vi = 0; + if (pstat->qos_info&0xf) { + if (pstat->qos_info&BIT(0)) + pstat->uapsd_vo = BIT(0)|BIT(1); + else + pstat->uapsd_vo = 0; - if (pstat->qos_info&BIT(2)) - pstat->uapsd_bk = BIT(0)|BIT(1); - else - pstat->uapsd_bk = 0; + if (pstat->qos_info&BIT(1)) + pstat->uapsd_vi = BIT(0)|BIT(1); + else + pstat->uapsd_vi = 0; - if (pstat->qos_info&BIT(3)) - pstat->uapsd_be = BIT(0)|BIT(1); - else - pstat->uapsd_be = 0; + if (pstat->qos_info&BIT(2)) + pstat->uapsd_bk = BIT(0)|BIT(1); + else + pstat->uapsd_bk = 0; - } + if (pstat->qos_info&BIT(3)) + pstat->uapsd_be = BIT(0)|BIT(1); + else + pstat->uapsd_be = 0; - break; } - } else { + break; } p = p + ie_len + 2; -- 2.52.0