staging: rtl8723bs: little cleanup

PATCH In review Fabio Aiuto 2 participants 7 messages Jul 30, 2021 – Aug 2, 2021 Staging

lore

Share & tools

lore

Fabio Aiuto

author

2021-07-30 14:54 UTC #0 lore raw

cover staging: rtl8723bs: little cleanup

This patch series does some little cleanup

Fabio Aiuto (4):
staging: rtl8723bs: fix camel case issue in struct wlan_bssid_ex
staging: rtl8723bs: remove unnecessary parentheses
staging: rtl8723bs: align condition to match open parentheses
staging: rtl8723bs: put condition parentheses at the end of a line

 drivers/staging/rtl8723bs/core/rtw_mlme.c         | 13 ++++++-------
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c     |  8 ++++----
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c    |  2 +-
 drivers/staging/rtl8723bs/include/wlan_bssdef.h   |  2 +-
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c |  2 +-
 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c    | 12 ++++++------
 6 files changed, 19 insertions(+), 20 deletions(-)

Signature · 1 line

2.20.1

Fabio Aiuto

author

2021-07-30 14:54 UTC #1 lore raw

PATCH 1/4 staging: rtl8723bs: fix camel case issue in struct wlan_bssid_ex

fix camel case issue in field Reserved in struct wlan_bssid_ex

Signed-off-by Fabio Aiuto <[email protected]>

---
 drivers/staging/rtl8723bs/core/rtw_mlme.c         | 12 ++++++------
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c     |  8 ++++----
 drivers/staging/rtl8723bs/core/rtw_wlan_util.c    |  2 +-
 drivers/staging/rtl8723bs/include/wlan_bssdef.h   |  2 +-
 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c |  2 +-
 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c    | 12 ++++++------
 6 files changed, 19 insertions(+), 19 deletions(-)

drivers/staging/rtl8723bs/core/rtw_mlme.c +6 -6

index a0c19253095d..9f97986e8680 100644
@@ -483,8 +483,8 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
 	}
 
 	if (update_ie) {
-		dst->Reserved[0] = src->Reserved[0];
-		dst->Reserved[1] = src->Reserved[1];
+		dst->reserved[0] = src->reserved[0];
+		dst->reserved[1] = src->reserved[1];
 		memcpy((u8 *)dst, (u8 *)src, get_wlan_bssid_ex_sz(src));
 	}

@@ -600,13 +600,13 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
 
 		pnetwork->last_scanned = jiffies;
 
-		/* target.Reserved[0]== 1, means that scanned network is a bcn frame. */
-		if ((pnetwork->network.ie_length > target->ie_length) && (target->Reserved[0] == 1))
+		/* target.reserved[0]== 1, means that scanned network is a bcn frame. */
+		if ((pnetwork->network.ie_length > target->ie_length) && (target->reserved[0] == 1))
 			update_ie = false;
 
 		/*  probe resp(3) > beacon(1) > probe req(2) */
-		if ((target->Reserved[0] != 2) &&
-			(target->Reserved[0] >= pnetwork->network.Reserved[0])
+		if ((target->reserved[0] != 2) &&
+			(target->reserved[0] >= pnetwork->network.reserved[0])
 			) {
 			update_ie = true;
 		} else {

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +4 -4

index 07986eeafe08..375d2a742dd2 100644
@@ -3971,18 +3971,18 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str
 	subtype = GetFrameSubType(pframe);
 
 	if (subtype == WIFI_BEACON) {
-		bssid->Reserved[0] = 1;
+		bssid->reserved[0] = 1;
 		ie_offset = _BEACON_IE_OFFSET_;
 	} else {
 		/*  FIXME : more type */
 		if (subtype == WIFI_PROBERSP) {
 			ie_offset = _PROBERSP_IE_OFFSET_;
-			bssid->Reserved[0] = 3;
+			bssid->reserved[0] = 3;
 		} else if (subtype == WIFI_PROBEREQ) {
 			ie_offset = _PROBEREQ_IE_OFFSET_;
-			bssid->Reserved[0] = 2;
+			bssid->reserved[0] = 2;
 		} else {
-			bssid->Reserved[0] = 0;
+			bssid->reserved[0] = 0;
 			ie_offset = _FIXED_IE_LENGTH_;
 		}
 	}

drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1

index 2a2a8634beb7..865a82d5cedb 100644
@@ -1223,7 +1223,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len)
 	subtype = GetFrameSubType(pframe) >> 4;
 
 	if (subtype == WIFI_BEACON)
-		bssid->Reserved[0] = 1;
+		bssid->reserved[0] = 1;
 
 	bssid->length = sizeof(struct wlan_bssid_ex) - MAX_IE_SZ + len;

drivers/staging/rtl8723bs/include/wlan_bssdef.h +1 -1

index 530c95275c1e..eb38594c8f5c 100644
@@ -156,7 +156,7 @@ struct wlan_bcn_info {
 struct wlan_bssid_ex {
 	u32  length;
 	NDIS_802_11_MAC_ADDRESS  mac_address;
-	u8  Reserved[2];/* 0]: IS beacon frame */
+	u8  reserved[2];/* 0]: IS beacon frame */
 	struct ndis_802_11_ssid  ssid;
 	u32  privacy;
 	long  rssi;/* in dBM, raw data , get from PHY) */

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -1

index dc23470fcdef..12b8e1773a84 100644
@@ -305,7 +305,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl
 	SetSeqNum(pwlanhdr, 0/*pmlmeext->mgnt_seq*/);
 	/* pmlmeext->mgnt_seq++; */
 
-	if (pnetwork->network.Reserved[0] == 1) { /*  WIFI_BEACON */
+	if (pnetwork->network.reserved[0] == 1) { /*  WIFI_BEACON */
 		eth_broadcast_addr(pwlanhdr->addr1);
 		SetFrameSubType(pbuf, WIFI_BEACON);
 	} else {

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +6 -6

index 1383f84a4425..19c5c7e8f403 100644
@@ -84,7 +84,7 @@ static char *translate_scan(struct adapter *padapter,
 	u32 i = 0;
 	u8 bw_40MHz = 0, short_GI = 0;
 	u16 mcs_rate = 0, vht_data_rate = 0;
-	u8 ie_offset = (pnetwork->network.Reserved[0] == 2 ? 0 : 12);
+	u8 ie_offset = (pnetwork->network.reserved[0] == 2 ? 0 : 12);
 	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
 	u8 ss, sq;

@@ -102,7 +102,7 @@ static char *translate_scan(struct adapter *padapter,
 	start = iwe_stream_add_point(info, start, stop, &iwe, pnetwork->network.ssid.ssid);
 
 	/* parsing HT_CAP_IE */
-	if (pnetwork->network.Reserved[0] == 2) { /*  Probe Request */
+	if (pnetwork->network.reserved[0] == 2) { /*  Probe Request */
 		p = rtw_get_ie(&pnetwork->network.ies[0], WLAN_EID_HT_CAPABILITY, &ht_ielen, pnetwork->network.ie_length);
 	} else {
 		p = rtw_get_ie(&pnetwork->network.ies[12], WLAN_EID_HT_CAPABILITY, &ht_ielen, pnetwork->network.ie_length-12);

@@ -140,7 +140,7 @@ static char *translate_scan(struct adapter *padapter,
 	start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_CHAR_LEN);
 
 	  /* Add mode */
-	if (pnetwork->network.Reserved[0] == 2) { /*  Probe Request */
+	if (pnetwork->network.reserved[0] == 2) { /*  Probe Request */
 		cap = 0;
 	} else {
 		__le16 le_tmp;

@@ -211,7 +211,7 @@ static char *translate_scan(struct adapter *padapter,
 	start = iwe_stream_add_event(info, start, stop, &iwe, IW_EV_PARAM_LEN);
 
 	/* parsing WPA/WPA2 IE */
-	if (pnetwork->network.Reserved[0] != 2) { /*  Probe Request */
+	if (pnetwork->network.reserved[0] != 2) { /*  Probe Request */
 		u8 *buf;
 		u8 wpa_ie[255], rsn_ie[255];
 		u16 wpa_len = 0, rsn_len = 0;

@@ -274,7 +274,7 @@ static char *translate_scan(struct adapter *padapter,
 		u8 *ie_ptr;
 		total_ielen = pnetwork->network.ie_length - ie_offset;
 
-		if (pnetwork->network.Reserved[0] == 2) { /*  Probe Request */
+		if (pnetwork->network.reserved[0] == 2) { /*  Probe Request */
 			ie_ptr = pnetwork->network.ies;
 			total_ielen = pnetwork->network.ie_length;
 		} else {    /*  Beacon or Probe Respones */

@@ -324,7 +324,7 @@ static char *translate_scan(struct adapter *padapter,
 		if (!buf)
 			goto exit;
 
-		pos = pnetwork->network.Reserved;
+		pos = pnetwork->network.reserved;
 		memset(&iwe, 0, sizeof(iwe));
 		iwe.cmd = IWEVCUSTOM;
 		iwe.u.data.length = scnprintf(buf, MAX_WPA_IE_LEN, "fm =%02X%02X", pos[1], pos[0]);

Signature · 1 line

2.20.1

Fabio Aiuto

author

2021-07-30 14:54 UTC #2 lore raw

PATCH 2/4 staging: rtl8723bs: remove unnecessary parentheses

In reply to Fabio Aiuto

fix the following checkpatch issues:

CHECK: Unnecessary parentheses around 'pnetwork->network.ie_length > target->ie_length' 33: FILE: drivers/staging/rtl8723bs/core/rtw_mlme.c:604:
+ if ((pnetwork->network.ie_length >
target->ie_length) && (target->reserved[0] == 1))

CHECK: Unnecessary parentheses around 'target->reserved[0] == 1'
33: FILE: drivers/staging/rtl8723bs/core/rtw_mlme.c:604:
+ if ((pnetwork->network.ie_length >
target->ie_length) && (target->reserved[0] == 1))

CHECK: Unnecessary parentheses around 'target->reserved[0] != 2'
39: FILE: drivers/staging/rtl8723bs/core/rtw_mlme.c:608:
+ if ((target->reserved[0] != 2) &&
+ (target->reserved[0] >=

		pnetwork->network.reserved[0])

) {

CHECK: Unnecessary parentheses around 'target->reserved[0] >= pnetwork->network.reserved[0]' 39: FILE: drivers/staging/rtl8723bs/core/rtw_mlme.c:608:
+ if ((target->reserved[0] != 2) &&
+ (target->reserved[0]

		>= pnetwork->network.reserved[0])

) {

Signed-off-by Fabio Aiuto <[email protected]>

---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/staging/rtl8723bs/core/rtw_mlme.c +3 -3

index 9f97986e8680..df599c2009b3 100644
@@ -601,12 +601,12 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
 		pnetwork->last_scanned = jiffies;
 
 		/* target.reserved[0]== 1, means that scanned network is a bcn frame. */
-		if ((pnetwork->network.ie_length > target->ie_length) && (target->reserved[0] == 1))
+		if (pnetwork->network.ie_length > target->ie_length && target->reserved[0] == 1)
 			update_ie = false;
 
 		/*  probe resp(3) > beacon(1) > probe req(2) */
-		if ((target->reserved[0] != 2) &&
-			(target->reserved[0] >= pnetwork->network.reserved[0])
+		if (target->reserved[0] != 2 &&
+			target->reserved[0] >= pnetwork->network.reserved[0]
 			) {
 			update_ie = true;
 		} else {

Signature · 1 line

2.20.1

Dan Carpenter

2021-08-02 13:06 UTC #3 lore raw

Re: [PATCH 2/4] staging: rtl8723bs: remove unnecessary parentheses

Please fold patches 2, 3 and 4 together. It counts as one patch because it's "tidying up the condition".

regards,
dan carpenter

Fabio Aiuto

author

2021-08-02 13:30 UTC #4 lore raw

Re: [PATCH 2/4] staging: rtl8723bs: remove unnecessary parentheses

Hello Dan,

Quoted 7 lines · Dan Carpenter

Please fold patches 2, 3 and 4 together. It counts as one patch because it's "tidying up the condition".
regards,
dan carpenter

ok I will next time I'll be submitting a similar cleaning, they are already in staging-next...

thank you,

fabio

Fabio Aiuto

author

2021-07-30 14:54 UTC #5 lore raw

PATCH 3/4 staging: rtl8723bs: align condition to match open parentheses

In reply to Fabio Aiuto

fix following checkpatch issue:

CHECK: Alignment should match open parenthesis 54: FILE: drivers/staging/rtl8723bs/core/rtw_mlme.c:609:
+ if (target->reserved[0] != 2 &&
+ target->reserved[0] >=

		pnetwork->network.reserved[0]

Signed-off-by Fabio Aiuto <[email protected]>

---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -1

index df599c2009b3..d3d068babb5e 100644
@@ -606,7 +606,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
 
 		/*  probe resp(3) > beacon(1) > probe req(2) */
 		if (target->reserved[0] != 2 &&
-			target->reserved[0] >= pnetwork->network.reserved[0]
+		    target->reserved[0] >= pnetwork->network.reserved[0]
 			) {
 			update_ie = true;
 		} else {

Signature · 1 line

2.20.1

Fabio Aiuto

author

2021-07-30 14:54 UTC #6 lore raw

PATCH 4/4 staging: rtl8723bs: put condition parentheses at the end of a line

In reply to Fabio Aiuto

put the closing parenthese at the end of a line

Signed-off-by Fabio Aiuto <[email protected]>

---
 drivers/staging/rtl8723bs/core/rtw_mlme.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

drivers/staging/rtl8723bs/core/rtw_mlme.c +1 -2

index d3d068babb5e..5ed13bf765d2 100644
@@ -606,8 +606,7 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t
 
 		/*  probe resp(3) > beacon(1) > probe req(2) */
 		if (target->reserved[0] != 2 &&
-		    target->reserved[0] >= pnetwork->network.reserved[0]
-			) {
+		    target->reserved[0] >= pnetwork->network.reserved[0]) {
 			update_ie = true;
 		} else {
 			update_ie = false;

Signature · 1 line

2.20.1