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

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: default avatarFabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/a70fd91a46fd2c75eb27824ea57ae0d87d65bf81.1627656773.git.fabioaiuto83@gmail.com


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

drivers/staging/rtl8723bs/core/rtw_mlme.c

+6 −6
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 {