Commit 3f15277b authored by Ross Schmidt's avatar Ross Schmidt Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: replace _SSID_IE_ 



Replace unique _SSID_IE_ macro with kernel provided WLAN_EID_SSID from
linux/ieee80211.h.

Signed-off-by: default avatarRoss Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201208040733.379197-7-ross.schm.dev@gmail.com


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

drivers/staging/rtl8723bs/core/rtw_ap.c

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static void update_BCNTIM(struct adapter *padapter) 
			/* get ssid_ie len */

			p = rtw_get_ie(

				pie + _BEACON_IE_OFFSET_,

				_SSID_IE_,

				WLAN_EID_SSID,

				&tmp_len,

				(pnetwork_mlmeext->IELength - _BEACON_IE_OFFSET_)

			);
@@ -1004,7 +1004,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	/* SSID */

	p = rtw_get_ie(

		ie + _BEACON_IE_OFFSET_,

		_SSID_IE_,

		WLAN_EID_SSID,

		&ie_len,

		(pbss_network->IELength - _BEACON_IE_OFFSET_)

	);

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

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



	/* SSID */

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

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



	/* supported rates */

	if (pregistrypriv->wireless_mode == WIRELESS_11ABGN) {

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+10 −10
Original line number Diff line number Diff line
@@ -728,7 +728,7 @@ unsigned int OnProbeReq(struct adapter *padapter, union recv_frame *precv_frame) 


#endif /* CONFIG_AUTO_AP_MODE */



	p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, _SSID_IE_, (int *)&ielen,

	p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + _PROBEREQ_IE_OFFSET_, WLAN_EID_SSID, (int *)&ielen,

			len - WLAN_HDR_A3_LEN - _PROBEREQ_IE_OFFSET_);
@@ -1251,7 +1251,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) 


	/*  now we should check all the fields... */

	/*  checking SSID */

	p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, _SSID_IE_, &ie_len,

	p = rtw_get_ie(pframe + WLAN_HDR_A3_LEN + ie_offset, WLAN_EID_SSID, &ie_len,

		pkt_len - WLAN_HDR_A3_LEN - ie_offset);



	if (!p || ie_len == 0) {
@@ -2536,7 +2536,7 @@ void issue_beacon(struct adapter *padapter, int timeout_ms) 
	pattrib->pktlen += 2;



	/*  SSID */

	pframe = rtw_set_ie(pframe, _SSID_IE_, cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &pattrib->pktlen);

	pframe = rtw_set_ie(pframe, WLAN_EID_SSID, cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &pattrib->pktlen);



	/*  supported rates... */

	rate_len = rtw_get_rateset_len(cur_network->SupportedRates);
@@ -2692,7 +2692,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p 
			u8 buf[MAX_IE_SZ];

			u8 *ies = pmgntframe->buf_addr+TXDESC_OFFSET+sizeof(struct ieee80211_hdr_3addr);



			ssid_ie = rtw_get_ie(ies+_FIXED_IE_LENGTH_, _SSID_IE_, &ssid_ielen,

			ssid_ie = rtw_get_ie(ies+_FIXED_IE_LENGTH_, WLAN_EID_SSID, &ssid_ielen,

				(pframe-ies)-_FIXED_IE_LENGTH_);



			ssid_ielen_diff = cur_network->Ssid.SsidLength - ssid_ielen;
@@ -2740,7 +2740,7 @@ void issue_probersp(struct adapter *padapter, unsigned char *da, u8 is_valid_p2p 
		/* below for ad-hoc mode */



		/*  SSID */

		pframe = rtw_set_ie(pframe, _SSID_IE_, cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &pattrib->pktlen);

		pframe = rtw_set_ie(pframe, WLAN_EID_SSID, cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &pattrib->pktlen);



		/*  supported rates... */

		rate_len = rtw_get_rateset_len(cur_network->SupportedRates);
@@ -2870,9 +2870,9 @@ static int _issue_probereq(struct adapter *padapter, 
	pattrib->pktlen = sizeof(struct ieee80211_hdr_3addr);



	if (pssid)

		pframe = rtw_set_ie(pframe, _SSID_IE_, pssid->SsidLength, pssid->Ssid, &(pattrib->pktlen));

		pframe = rtw_set_ie(pframe, WLAN_EID_SSID, pssid->SsidLength, pssid->Ssid, &(pattrib->pktlen));

	else

		pframe = rtw_set_ie(pframe, _SSID_IE_, 0, NULL, &(pattrib->pktlen));

		pframe = rtw_set_ie(pframe, WLAN_EID_SSID, 0, NULL, &(pattrib->pktlen));



	get_rate_set(padapter, bssrate, &bssrate_len);
@@ -3280,7 +3280,7 @@ void issue_assocreq(struct adapter *padapter) 
	pattrib->pktlen += 2;



	/* SSID */

	pframe = rtw_set_ie(pframe, _SSID_IE_,  pmlmeinfo->network.Ssid.SsidLength, pmlmeinfo->network.Ssid.Ssid, &(pattrib->pktlen));

	pframe = rtw_set_ie(pframe, WLAN_EID_SSID,  pmlmeinfo->network.Ssid.SsidLength, pmlmeinfo->network.Ssid.Ssid, &(pattrib->pktlen));



	/* supported rate & extended supported rate */
@@ -4464,7 +4464,7 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str 
	bssid->PhyInfo.SignalStrength = precv_frame->u.hdr.attrib.phy_info.SignalStrength;/* in percentage */



	/*  checking SSID */

	p = rtw_get_ie(bssid->IEs + ie_offset, _SSID_IE_, &len, bssid->IELength - ie_offset);

	p = rtw_get_ie(bssid->IEs + ie_offset, WLAN_EID_SSID, &len, bssid->IELength - ie_offset);

	if (p == NULL) {

		DBG_871X("marc: cannot find SSID for survey event\n");

		return _FAIL;
@@ -5959,7 +5959,7 @@ static int rtw_auto_ap_start_beacon(struct adapter *adapter) 
	ie += 2;



	/* SSID */

	ie = rtw_set_ie(ie, _SSID_IE_, ssid_len, ssid, &sz);

	ie = rtw_set_ie(ie, WLAN_EID_SSID, ssid_len, ssid, &sz);



	/* supported rates */

	wireless_mode = WIRELESS_11BG_24N;

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

+1 −1
Original line number Diff line number Diff line
@@ -1341,7 +1341,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) 


	/* checking SSID */

	ssid_len = 0;

	p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _SSID_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_);

	p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, WLAN_EID_SSID, &len, bssid->IELength - _FIXED_IE_LENGTH_);

	if (p) {

		ssid_len = *(p + 1);

		if (ssid_len > NDIS_802_11_LENGTH_SSID)

drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c

+3 −3
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength) 
	/* below for ad-hoc mode */



	/*  SSID */

	pframe = rtw_set_ie(pframe, _SSID_IE_, cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &pktlen);

	pframe = rtw_set_ie(pframe, WLAN_EID_SSID, cur_network->Ssid.SsidLength, cur_network->Ssid.Ssid, &pktlen);



	/*  supported rates... */

	rate_len = rtw_get_rateset_len(cur_network->SupportedRates);
@@ -695,7 +695,7 @@ static void ConstructProbeReq(struct adapter *padapter, u8 *pframe, u32 *pLength 
	pktlen = sizeof(struct ieee80211_hdr_3addr);

	pframe += pktlen;



	pframe = rtw_set_ie(pframe, _SSID_IE_, 0, NULL, &pktlen);

	pframe = rtw_set_ie(pframe, WLAN_EID_SSID, 0, NULL, &pktlen);



	get_rate_set(padapter, bssrate, &bssrate_len);
@@ -793,7 +793,7 @@ static void ConstructProbeRsp(struct adapter *padapter, u8 *pframe, u32 *pLength 
		u8 buf[MAX_IE_SZ];

		u8 *ies = pframe + sizeof(struct ieee80211_hdr_3addr);



		ssid_ie = rtw_get_ie(ies+_FIXED_IE_LENGTH_, _SSID_IE_, &ssid_ielen,

		ssid_ie = rtw_get_ie(ies+_FIXED_IE_LENGTH_, WLAN_EID_SSID, &ssid_ielen,

					(pframe-ies)-_FIXED_IE_LENGTH_);



		ssid_ielen_diff = cur_network->Ssid.SsidLength - ssid_ielen;