staging: rtl8723bs: fix CamelCase warning for OnAssoc

PATCH In review Dalvin-Ehinoma Noah Aiguobas 2 participants 2 messages Jun 23 – Jul 7 Staging

Share & tools

Dalvin-Ehinoma Noah Aiguobas

author

2026-06-23 09:52 UTC #0 lore raw

PATCH 1/1 staging: rtl8723bs: fix CamelCase warning for OnAssoc

Rename OnAssoc values from CamelCase to snake_case to conform to linux kernel coding style:
OnAssocReq -> on_assoc_req
OnAssocRsp -> on_assoc_rsp
WMMOnAssocRsp -> WMM_on_assoc_rsp
HTOnAssocRsp -> HT_on_assoc_rsp
OnAssocReqFail -> on_assoc_req_fail

Signed-off-by Dalvin-Ehinoma Noah Aiguobas <[email protected]>

---
 drivers/staging/rtl8723bs/core/rtw_mlme.c     |  2 +-
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 38 +++++++++----------
 .../staging/rtl8723bs/core/rtw_wlan_util.c    |  4 +-
 .../staging/rtl8723bs/include/rtw_mlme_ext.h  |  8 ++--
 4 files changed, 26 insertions(+), 26 deletions(-)

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

index 1196ec011455..f7662c918473 100644
@@ -1496,7 +1496,7 @@ void rtw_cpwm_event_callback(struct adapter *padapter, u8 *pbuf)
 
 void rtw_wmm_event_callback(struct adapter *padapter, u8 *pbuf)
 {
-	WMMOnAssocRsp(padapter);
+	WMM_on_assoc_rsp(padapter);
 }
 
 /*

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +19 ~~-19~~

index a86d6f97cf02..b32e1e7ac4ba 100644
@@ -12,10 +12,10 @@
 #include <linux/unaligned.h>
 
 static struct mlme_handler mlme_sta_tbl[] = {
-	{WIFI_ASSOCREQ,		"OnAssocReq",	&OnAssocReq},
-	{WIFI_ASSOCRSP,		"OnAssocRsp",	&OnAssocRsp},
-	{WIFI_REASSOCREQ,	"OnReAssocReq",	&OnAssocReq},
-	{WIFI_REASSOCRSP,	"OnReAssocRsp",	&OnAssocRsp},
+	{WIFI_ASSOCREQ,		"on_assoc_req",	&on_assoc_req},
+	{WIFI_ASSOCRSP,		"on_assoc_rsp",	&on_assoc_rsp},
+	{WIFI_REASSOCREQ,	"OnReAssocReq",	&on_assoc_req},
+	{WIFI_REASSOCRSP,	"OnReAssocRsp",	&on_assoc_rsp},
 	{WIFI_PROBEREQ,		"OnProbeReq",	&OnProbeReq},
 	{WIFI_PROBERSP,		"OnProbeRsp",		&OnProbeRsp},

@@ -908,7 +908,7 @@ unsigned int OnAuthClient(struct adapter *padapter, union recv_frame *precv_fram
 	return _FAIL;
 }
 
-unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
+unsigned int on_assoc_req(struct adapter *padapter, union recv_frame *precv_frame)
 {
 	u16 capab_info;
 	struct rtw_ieee802_11_elems elems;

@@ -974,7 +974,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 	if (rtw_ieee802_11_parse_elems(pos, left, &elems, 1) == PARSE_FAILED ||
 	    !elems.ssid) {
 		status = WLAN_STATUS_CHALLENGE_FAIL;
-		goto OnAssocReqFail;
+		goto on_assoc_req_fail;
 	}
 
 	/*  now we should check all the fields... */

@@ -985,7 +985,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 	if (!p || ie_len == 0) {
 		/*  broadcast ssid, however it is not allowed in assocreq */
 		status = WLAN_STATUS_CHALLENGE_FAIL;
-		goto OnAssocReqFail;
+		goto on_assoc_req_fail;
 	} else {
 		/*  check if ssid match */
 		if (memcmp(p+2, cur->ssid.ssid, cur->ssid.ssid_length))

@@ -996,7 +996,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 	}
 
 	if (status != WLAN_STATUS_SUCCESS)
-		goto OnAssocReqFail;
+		goto on_assoc_req_fail;
 
 	/*  check if the supported rate is ok */
 	p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, WLAN_EID_SUPP_RATES, &ie_len, pkt_len - WLAN_HDR_A3_LEN - ie_offset);

@@ -1006,7 +1006,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 		/* support_rate_num = AP_BSSRATE_LEN; */
 
 		status = WLAN_STATUS_CHALLENGE_FAIL;
-		goto OnAssocReqFail;
+		goto on_assoc_req_fail;
 	} else {
 		if (ie_len > sizeof(supportRate))
 			ie_len = sizeof(supportRate);

@@ -1091,7 +1091,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 	}
 
 	if (status != WLAN_STATUS_SUCCESS)
-		goto OnAssocReqFail;
+		goto on_assoc_req_fail;
 
 	pstat->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS);
 	if (!wpa_ie) {

@@ -1112,7 +1112,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 				if (!selected_registrar) {
 					status = WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA;
 
-					goto OnAssocReqFail;
+					goto on_assoc_req_fail;
 				}
 			}
 		}

@@ -1123,7 +1123,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 		if (psecuritypriv->wpa_psk == 0) {
 			status = WLAN_STATUS_INVALID_IE;
 
-			goto OnAssocReqFail;
+			goto on_assoc_req_fail;
 		}
 
 		if (elems.wps_ie) {

@@ -1210,14 +1210,14 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 
 	if (!pmlmepriv->htpriv.ht_option && (pstat->flags&WLAN_STA_HT)) {
 		status = WLAN_STATUS_CHALLENGE_FAIL;
-		goto OnAssocReqFail;
+		goto on_assoc_req_fail;
 	}
 
 	if ((pstat->flags & WLAN_STA_HT) &&
 		    ((pstat->wpa2_pairwise_cipher&WPA_CIPHER_TKIP) ||
 		      (pstat->wpa_pairwise_cipher&WPA_CIPHER_TKIP))) {
 		/* status = WLAN_STATUS_CIPHER_SUITE_REJECTED; */
-		/* goto OnAssocReqFail; */
+		/* goto on_assoc_req_fail; */
 	}
 	pstat->flags |= WLAN_STA_NONERP;
 	for (i = 0; i < pstat->bssratelen; i++) {

@@ -1250,7 +1250,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 
 			status = WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA;
 
-			goto OnAssocReqFail;
+			goto on_assoc_req_fail;
 
 		} else {
 			pstapriv->sta_aid[pstat->aid - 1] = pstat;

@@ -1308,7 +1308,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 
 	return _FAIL;
 
-OnAssocReqFail:
+on_assoc_req_fail:
 
 	pstat->aid = 0;
 	if (frame_type == WIFI_ASSOCREQ)

@@ -1319,7 +1319,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 	return _FAIL;
 }
 
-unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame)
+unsigned int on_assoc_rsp(struct adapter *padapter, union recv_frame *precv_frame)
 {
 	uint i;
 	int res;

@@ -4672,10 +4672,10 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)
 	update_capinfo(padapter, pmlmeinfo->capability);
 
 	/* WMM, Update EDCA param */
-	WMMOnAssocRsp(padapter);
+	WMM_on_assoc_rsp(padapter);
 
 	/* HT */
-	HTOnAssocRsp(padapter);
+	HT_on_assoc_rsp(padapter);
 
 	/* Set cur_channel&cur_bwmode&cur_ch_offset */
 	set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode);

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

index 1d37c2d5b10d..68801977d54f 100644
@@ -701,7 +701,7 @@ static void sort_wmm_ac_params(u32 *inx, u32 *edca)
 	}
 }
 
-void WMMOnAssocRsp(struct adapter *padapter)
+void WMM_on_assoc_rsp(struct adapter *padapter)
 {
 	u8 ACI, ACM, AIFS, ECWMin, ECWMax, aSifsTime;
 	u8 acm_mask;

@@ -977,7 +977,7 @@ void HT_info_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE)
 	memcpy(&(pmlmeinfo->HT_info), pIE->data, pIE->length);
 }
 
-void HTOnAssocRsp(struct adapter *padapter)
+void HT_on_assoc_rsp(struct adapter *padapter)
 {
 	unsigned char max_AMPDU_len;
 	unsigned char min_MPDU_spacing;

drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +4 -4

index cb23c6939bfc..1395a82a33e1 100644
@@ -483,11 +483,11 @@ int is_IBSS_empty(struct adapter *padapter);
 unsigned char check_assoc_AP(u8 *pframe, uint len);
 
 int WMM_param_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE);
-void WMMOnAssocRsp(struct adapter *padapter);
+void WMM_on_assoc_rsp(struct adapter *padapter);
 
 void HT_caps_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE);
 void HT_info_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE);
-void HTOnAssocRsp(struct adapter *padapter);
+void HT_on_assoc_rsp(struct adapter *padapter);
 
 void ERP_IE_handler(struct adapter *padapter, struct ndis_80211_var_ie *pIE);
 void VCS_update(struct adapter *padapter, struct sta_info *psta);

@@ -558,8 +558,8 @@ void start_clnt_auth(struct adapter *padapter);
 void start_clnt_join(struct adapter *padapter);
 void start_create_ibss(struct adapter *padapter);
 
-unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame);
-unsigned int OnAssocRsp(struct adapter *padapter, union recv_frame *precv_frame);
+unsigned int on_assoc_req(struct adapter *padapter, union recv_frame *precv_frame);
+unsigned int on_assoc_rsp(struct adapter *padapter, union recv_frame *precv_frame);
 unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame);
 unsigned int OnProbeRsp(struct adapter *padapter, union recv_frame *precv_frame);
 unsigned int DoReserved(struct adapter *padapter, union recv_frame *precv_frame);

Signature · 1 line

2.54.0

Greg KH

maintainer

2026-07-07 11:28 UTC #1 lore raw

Quoted 7 lines · Dalvin-Ehinoma Noah Aiguobas

Rename OnAssoc values from CamelCase to snake_case to conform to linux kernel coding style:
OnAssocReq -> on_assoc_req
OnAssocRsp -> on_assoc_rsp
WMMOnAssocRsp -> WMM_on_assoc_rsp
HTOnAssocRsp -> HT_on_assoc_rsp
OnAssocReqFail -> on_assoc_req_fail

Why just these? It's a miss-mash of different things all at once. Please make this a series that does one function at a time.

Also, when you change the function names, make them more obvious they are in this driver as they turn into some pretty horrible global symbol names, right?

thanks,

greg k-h