Skip to contentSkip to conversation

staging: rtl8723bs: core/rtw_mlme_ext.c: flatten control flow in OnAssocReq()

PATCH In review William Hansen-Baird 2 participants 4 messages Jan 13 – Jan 16 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 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.

---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 59 +++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +29 -30
index ac49bfbaa5bb..d3b395894d4b 100644
@@ -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;
Signature · 1 line
2.52.0
#1 lore raw

PATCH 2/2 staging: rtl8723bs: core/rtw_mlme_ext.c: flatten indentation with early loop continue in OnAssocReq()

Replace large if (memcmp(p+2, WMM_IE, 6)) inside the for (;;) loop, which ends with a break, with an early continue.
This reduces deep nesting and is purely stylistic.

---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 61 ++++++++++---------
 1 file changed, 31 insertions(+), 30 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +31 -30
index d3b395894d4b..4eb28577fb6a 100644
@@ -1184,46 +1184,47 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 			if (!p)
 				break;
 
-			if (!memcmp(p+2, WMM_IE, 6)) {
+			if (memcmp(p+2, WMM_IE, 6)) {
+				p = p + ie_len + 2;
+				continue;
+			}
 
-				pstat->flags |= WLAN_STA_WME;
+			pstat->flags |= WLAN_STA_WME;
 
-				pstat->qos_option = 1;
-				pstat->qos_info = *(p+8);
+			pstat->qos_option = 1;
+			pstat->qos_info = *(p+8);
 
-				pstat->max_sp_len = (pstat->qos_info>>5)&0x3;
+			pstat->max_sp_len = (pstat->qos_info>>5)&0x3;
 
-				if ((pstat->qos_info&0xf) != 0xf)
-					pstat->has_legacy_ac = true;
-				else
-					pstat->has_legacy_ac = false;
-
-				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;
 			}
-			p = p + ie_len + 2;
+
+			break;
 		}
 	}
 
Signature · 1 line
2.52.0
maintainer
#2 lore raw

Re: [PATCH 2/2] staging: rtl8723bs: core/rtw_mlme_ext.c: flatten indentation with early loop continue in OnAssocReq()

Quoted 14 lines · William Hansen-Baird

Replace large if (memcmp(p+2, WMM_IE, 6)) inside the for (;;) loop, which ends with a break, with an early continue.
This reduces deep nesting and is purely stylistic.

---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 61 ++++++++++---------
 1 file changed, 31 insertions(+), 30 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +0 -0
index d3b395894d4b..4eb28577fb6a 100644

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) · line 1189

Quoted 7 lines
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +3 -1
@@ -1184,46 +1184,47 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 			if (!p)
 				break;
 
-			if (!memcmp(p+2, WMM_IE, 6)) {
+			if (memcmp(p+2, WMM_IE, 6)) {
+				p = p + ie_len + 2;
+				continue;

Ah, here's the loop, sorry about the previous review comment.

Ugh, what a mess. I'll take this now, hopefully it all still works :)

thanks,

greg k-h

maintainer
#3 lore raw
In reply to William Hansen-Baird
Quoted 77 lines · William Hansen-Baird

Rewrite if-else construct with an early exit to reduce indentation, and make the execution clearer.

---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 59 +++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +24 -28
index ac49bfbaa5bb..d3b395894d4b 100644
@@ -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;
 
-					}

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) · line 1224

Quoted 10 lines
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +5 -2
+					if (pstat->qos_info&BIT(3))
+						pstat->uapsd_be = BIT(0)|BIT(1);
+					else
+						pstat->uapsd_be = 0;
 
-					break;
 				}
-			} else {
+
 				break;

If all ways through this loop ends up in a break, why is this a loop at all?

thanks,

greg k-h