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

staging: rtl8723bs: fix camel case in struct wlan_bcn_info 



fix camel case in struct wlan_bcn_info all over the driver.

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


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

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

+14 −14
Original line number Diff line number Diff line
@@ -1034,9 +1034,9 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork) 


	if (pbuf && (wpa_ielen > 0)) {

		if (_SUCCESS == rtw_parse_wpa_ie(pbuf, wpa_ielen+2, &group_cipher, &pairwise_cipher, &is8021x)) {

			pnetwork->BcnInfo.pairwise_cipher = pairwise_cipher;

			pnetwork->BcnInfo.group_cipher = group_cipher;

			pnetwork->BcnInfo.is_8021x = is8021x;

			pnetwork->bcn_info.pairwise_cipher = pairwise_cipher;

			pnetwork->bcn_info.group_cipher = group_cipher;

			pnetwork->bcn_info.is_8021x = is8021x;

			ret = _SUCCESS;

		}

	} else {
@@ -1044,9 +1044,9 @@ static int rtw_get_cipher_info(struct wlan_network *pnetwork) 


		if (pbuf && (wpa_ielen > 0)) {

			if (_SUCCESS == rtw_parse_wpa2_ie(pbuf, wpa_ielen+2, &group_cipher, &pairwise_cipher, &is8021x)) {

				pnetwork->BcnInfo.pairwise_cipher = pairwise_cipher;

				pnetwork->BcnInfo.group_cipher = group_cipher;

				pnetwork->BcnInfo.is_8021x = is8021x;

				pnetwork->bcn_info.pairwise_cipher = pairwise_cipher;

				pnetwork->bcn_info.group_cipher = group_cipher;

				pnetwork->bcn_info.is_8021x = is8021x;

				ret = _SUCCESS;

			}

		}
@@ -1073,17 +1073,17 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) 
		bencrypt = 1;

		pnetwork->network.privacy = 1;

	} else {

		pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_OPENSYS;

		pnetwork->bcn_info.encryp_protocol = ENCRYP_PROTOCOL_OPENSYS;

	}

	rtw_get_sec_ie(pnetwork->network.ies, pnetwork->network.ie_length, NULL, &rsn_len, NULL, &wpa_len);



	if (rsn_len > 0) {

		pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_WPA2;

		pnetwork->bcn_info.encryp_protocol = ENCRYP_PROTOCOL_WPA2;

	} else if (wpa_len > 0) {

		pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_WPA;

		pnetwork->bcn_info.encryp_protocol = ENCRYP_PROTOCOL_WPA;

	} else {

		if (bencrypt)

			pnetwork->BcnInfo.encryp_protocol = ENCRYP_PROTOCOL_WEP;

			pnetwork->bcn_info.encryp_protocol = ENCRYP_PROTOCOL_WEP;

	}

	rtw_get_cipher_info(pnetwork);
@@ -1092,17 +1092,17 @@ void rtw_get_bcn_info(struct wlan_network *pnetwork) 
	p = rtw_get_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, WLAN_EID_HT_CAPABILITY, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);

	if (p && len > 0) {

			pht_cap = (struct ieee80211_ht_cap *)(p + 2);

			pnetwork->BcnInfo.ht_cap_info = le16_to_cpu(pht_cap->cap_info);

			pnetwork->bcn_info.ht_cap_info = le16_to_cpu(pht_cap->cap_info);

	} else {

			pnetwork->BcnInfo.ht_cap_info = 0;

			pnetwork->bcn_info.ht_cap_info = 0;

	}

	/* parsing HT_INFO_IE */

	p = rtw_get_ie(pnetwork->network.ies + _FIXED_IE_LENGTH_, WLAN_EID_HT_OPERATION, &len, pnetwork->network.ie_length - _FIXED_IE_LENGTH_);

	if (p && len > 0) {

			pht_info = (struct HT_info_element *)(p + 2);

			pnetwork->BcnInfo.ht_info_infos_0 = pht_info->infos[0];

			pnetwork->bcn_info.ht_info_infos_0 = pht_info->infos[0];

	} else {

			pnetwork->BcnInfo.ht_info_infos_0 = 0;

			pnetwork->bcn_info.ht_info_infos_0 = 0;

	}

}

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+8 −8
Original line number Diff line number Diff line
@@ -1248,12 +1248,12 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 
	} else {

		ht_info_infos_0 = 0;

	}

	if (ht_cap_info != cur_network->BcnInfo.ht_cap_info ||

	    ((ht_info_infos_0&0x03) != (cur_network->BcnInfo.ht_info_infos_0&0x03))) {

	if (ht_cap_info != cur_network->bcn_info.ht_cap_info ||

	    ((ht_info_infos_0&0x03) != (cur_network->bcn_info.ht_info_infos_0&0x03))) {

		{

			/* bcn_info_update */

			cur_network->BcnInfo.ht_cap_info = ht_cap_info;

			cur_network->BcnInfo.ht_info_infos_0 = ht_info_infos_0;

			cur_network->bcn_info.ht_cap_info = ht_cap_info;

			cur_network->bcn_info.ht_info_infos_0 = ht_info_infos_0;

			/* to do : need to check that whether modify related register of BB or not */

		}

		/* goto _mismatch; */
@@ -1313,7 +1313,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 
		if (bssid->privacy)

			encryp_protocol = ENCRYP_PROTOCOL_WEP;



	if (cur_network->BcnInfo.encryp_protocol != encryp_protocol)

	if (cur_network->bcn_info.encryp_protocol != encryp_protocol)

		goto _mismatch;



	if (encryp_protocol == ENCRYP_PROTOCOL_WPA || encryp_protocol == ENCRYP_PROTOCOL_WPA2) {
@@ -1329,11 +1329,11 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 
						  &pairwise_cipher, &is_8021x);

		}



		if (pairwise_cipher != cur_network->BcnInfo.pairwise_cipher ||

		    group_cipher != cur_network->BcnInfo.group_cipher)

		if (pairwise_cipher != cur_network->bcn_info.pairwise_cipher ||

		    group_cipher != cur_network->bcn_info.group_cipher)

			goto _mismatch;



		if (is_8021x != cur_network->BcnInfo.is_8021x)

		if (is_8021x != cur_network->bcn_info.is_8021x)

			goto _mismatch;

	}

drivers/staging/rtl8723bs/include/wlan_bssdef.h

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ struct wlan_network { 
	int	aid;			/* will only be valid when a BSS is joinned. */

	int	join_res;

	struct wlan_bssid_ex	network; /* must be the last item */

	struct wlan_bcn_info	BcnInfo;

	struct wlan_bcn_info	bcn_info;

};



enum {