Commit 6994aa43 authored by Fabio Aiuto's avatar Fabio Aiuto Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: fix camel case in struct ndis_802_11_ssid 



fix camel case in struct ndis_802_11_ssid all over the driver.

Signed-off-by: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/e7c4cc09840e112d59ed7dcf8465f1916f95b819.1626874164.git.fabioaiuto83@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 81ec005b

drivers/staging/rtl8723bs/core/rtw_ap.c

+2 −2
Original line number Diff line number Diff line
@@ -867,8 +867,8 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	);

	if (p && ie_len > 0) {

		memset(&pbss_network->ssid, 0, sizeof(struct ndis_802_11_ssid));

		memcpy(pbss_network->ssid.Ssid, (p + 2), ie_len);

		pbss_network->ssid.SsidLength = ie_len;

		memcpy(pbss_network->ssid.ssid, (p + 2), ie_len);

		pbss_network->ssid.ssid_length = ie_len;

	}



	/* channel */

drivers/staging/rtl8723bs/core/rtw_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ u8 rtw_sitesurvey_cmd(struct adapter *padapter, struct ndis_802_11_ssid *ssid, 
		int i;



		for (i = 0; i < ssid_num && i < RTW_SSID_SCAN_AMOUNT; i++) {

			if (ssid[i].SsidLength) {

			if (ssid[i].ssid_length) {

				memcpy(&psurveyPara->ssid[i], &ssid[i], sizeof(struct ndis_802_11_ssid));

				psurveyPara->ssid_num++;

			}

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ int rtw_generate_ie(struct registry_priv *pregistrypriv) 
	ie += 2;



	/* SSID */

	ie = rtw_set_ie(ie, WLAN_EID_SSID, pdev_network->ssid.SsidLength, pdev_network->ssid.Ssid, &sz);

	ie = rtw_set_ie(ie, WLAN_EID_SSID, pdev_network->ssid.ssid_length, pdev_network->ssid.ssid, &sz);



	/* supported rates */

	wireless_mode = pregistrypriv->wireless_mode;

drivers/staging/rtl8723bs/core/rtw_ioctl_set.c

+4 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ u8 rtw_validate_ssid(struct ndis_802_11_ssid *ssid) 
{

	u8 ret = true;



	if (ssid->SsidLength > 32) {

	if (ssid->ssid_length > 32) {

		ret = false;

		goto exit;

	}
@@ -207,7 +207,7 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid) 
	struct wlan_network *pnetwork = &pmlmepriv->cur_network;



	netdev_dbg(padapter->pnetdev, "set ssid [%s] fw_state = 0x%08x\n",

		   ssid->Ssid, get_fwstate(pmlmepriv));

		   ssid->ssid, get_fwstate(pmlmepriv));



	if (padapter->hw_init_completed == false) {

		status = _FAIL;
@@ -222,8 +222,8 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid) 
		goto release_mlme_lock;



	if (check_fwstate(pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE) == true) {

		if ((pmlmepriv->assoc_ssid.SsidLength == ssid->SsidLength) &&

		    (!memcmp(&pmlmepriv->assoc_ssid.Ssid, ssid->Ssid, ssid->SsidLength))) {

		if ((pmlmepriv->assoc_ssid.ssid_length == ssid->ssid_length) &&

		    (!memcmp(&pmlmepriv->assoc_ssid.ssid, ssid->ssid, ssid->ssid_length))) {

			if ((check_fwstate(pmlmepriv, WIFI_STATION_STATE) == false)) {

				if (rtw_is_same_ibss(padapter, pnetwork) == false) {

					/* if in WIFI_ADHOC_MASTER_STATE | WIFI_ADHOC_STATE, create bss or rejoin again */

drivers/staging/rtl8723bs/core/rtw_mlme.c

+9 −9
Original line number Diff line number Diff line
@@ -377,8 +377,8 @@ int rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork) 


inline int is_same_ess(struct wlan_bssid_ex *a, struct wlan_bssid_ex *b)

{

	return (a->ssid.SsidLength == b->ssid.SsidLength)

		&&  !memcmp(a->ssid.Ssid, b->ssid.Ssid, a->ssid.SsidLength);

	return (a->ssid.ssid_length == b->ssid.ssid_length)

		&&  !memcmp(a->ssid.ssid, b->ssid.ssid, a->ssid.ssid_length);

}



int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 feature)
@@ -395,10 +395,10 @@ int is_same_network(struct wlan_bssid_ex *src, struct wlan_bssid_ex *dst, u8 fea 
	s_cap = le16_to_cpu(tmps);

	d_cap = le16_to_cpu(tmpd);



	return (src->ssid.SsidLength == dst->ssid.SsidLength) &&

	return (src->ssid.ssid_length == dst->ssid.ssid_length) &&

		/* 	(src->configuration.ds_config == dst->configuration.ds_config) && */

			((!memcmp(src->mac_address, dst->mac_address, ETH_ALEN))) &&

			((!memcmp(src->ssid.Ssid, dst->ssid.Ssid, src->ssid.SsidLength))) &&

			((!memcmp(src->ssid.ssid, dst->ssid.ssid, src->ssid.ssid_length))) &&

			((s_cap & WLAN_CAPABILITY_IBSS) ==

			(d_cap & WLAN_CAPABILITY_IBSS)) &&

			((s_cap & WLAN_CAPABILITY_ESS) ==
@@ -728,8 +728,8 @@ void rtw_survey_event_callback(struct adapter *adapter, u8 *pbuf) 


	/*  lock pmlmepriv->lock when you accessing network_q */

	if ((check_fwstate(pmlmepriv, _FW_UNDER_LINKING)) == false) {

		if (pnetwork->ssid.Ssid[0] == 0)

			pnetwork->ssid.SsidLength = 0;

		if (pnetwork->ssid.ssid[0] == 0)

			pnetwork->ssid.ssid_length = 0;

		rtw_add_network(adapter, pnetwork);

	}
@@ -1804,9 +1804,9 @@ static int rtw_check_join_candidate(struct mlme_priv *mlme 
	}



	/* check ssid, if needed */

	if (mlme->assoc_ssid.Ssid[0] && mlme->assoc_ssid.SsidLength) {

		if (competitor->network.ssid.SsidLength != mlme->assoc_ssid.SsidLength

			|| memcmp(competitor->network.ssid.Ssid, mlme->assoc_ssid.Ssid, mlme->assoc_ssid.SsidLength)

	if (mlme->assoc_ssid.ssid[0] && mlme->assoc_ssid.ssid_length) {

		if (competitor->network.ssid.ssid_length != mlme->assoc_ssid.ssid_length

			|| memcmp(competitor->network.ssid.ssid, mlme->assoc_ssid.ssid, mlme->assoc_ssid.ssid_length)

		)

			goto exit;

	}