diff options
| author | William Hansen-Baird <william.hansen.baird@gmail.com> | 2026-01-14 00:14:32 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-01-16 16:07:02 +0300 |
| commit | ccfab310ee181ab03f46c53413d57468199e29eb (patch) | |
| tree | dc896340b7101462a827b83efbb8ad7efcbaaded | |
| parent | fbe360699266d0fb3072a81175ea656f313418ed (diff) | |
| download | linux-ccfab310ee181ab03f46c53413d57468199e29eb.tar.xz | |
staging: rtl8723bs: core/rtw_mlme_ext.c: flatten control flow in OnAssocReq()
Rewrite if-else construct with an early exit to reduce indentation,
and make the execution clearer.
Signed-off-by: William Hansen-Baird <william.hansen.baird@gmail.com>
Link: https://patch.msgid.link/20260113211433.89512-1-william.hansen.baird@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 59 |
1 files 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 e798f35f0f36..ccb41922f727 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; |