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

staging: rtl8723bs: fix camel case in struct wlan_phy_info 



fix camel case in struct wlan_phy_info all over the driver.

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


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

drivers/staging/rtl8723bs/core/rtw_mlme.c

+15 −15
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, 
{

	long rssi_ori = dst->rssi;



	u8 sq_smp = src->phy_info.SignalQuality;

	u8 sq_smp = src->phy_info.signal_quality;



	u8 ss_final;

	u8 sq_final;
@@ -470,13 +470,13 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, 
			rssi_final = rssi_ori;

	} else {

		if (sq_smp != 101) { /* from the right channel */

			ss_final = ((u32)(src->phy_info.SignalStrength)+(u32)(dst->phy_info.SignalStrength)*4)/5;

			sq_final = ((u32)(src->phy_info.SignalQuality)+(u32)(dst->phy_info.SignalQuality)*4)/5;

			ss_final = ((u32)(src->phy_info.signal_strength)+(u32)(dst->phy_info.signal_strength)*4)/5;

			sq_final = ((u32)(src->phy_info.signal_quality)+(u32)(dst->phy_info.signal_quality)*4)/5;

			rssi_final = (src->rssi+dst->rssi*4)/5;

		} else {

			/* bss info not receiving from the right channel, use the original RX signal infos */

			ss_final = dst->phy_info.SignalStrength;

			sq_final = dst->phy_info.SignalQuality;

			ss_final = dst->phy_info.signal_strength;

			sq_final = dst->phy_info.signal_quality;

			rssi_final = dst->rssi;

		}
@@ -488,8 +488,8 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src, 
		memcpy((u8 *)dst, (u8 *)src, get_wlan_bssid_ex_sz(src));

	}



	dst->phy_info.SignalStrength = ss_final;

	dst->phy_info.SignalQuality = sq_final;

	dst->phy_info.signal_strength = ss_final;

	dst->phy_info.signal_quality = sq_final;

	dst->rssi = rssi_final;

}
@@ -568,8 +568,8 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t 
			pnetwork->join_res = 0;



			/* bss info not receiving from the right channel */

			if (pnetwork->network.phy_info.SignalQuality == 101)

				pnetwork->network.phy_info.SignalQuality = 0;

			if (pnetwork->network.phy_info.signal_quality == 101)

				pnetwork->network.phy_info.signal_quality = 0;

		} else {

			/* Otherwise just pull from the free list */
@@ -585,8 +585,8 @@ void rtw_update_scanned_network(struct adapter *adapter, struct wlan_bssid_ex *t 
			pnetwork->last_scanned = jiffies;



			/* bss info not receiving from the right channel */

			if (pnetwork->network.phy_info.SignalQuality == 101)

				pnetwork->network.phy_info.SignalQuality = 0;

			if (pnetwork->network.phy_info.signal_quality == 101)

				pnetwork->network.phy_info.signal_quality = 0;



			list_add_tail(&(pnetwork->list), &(queue->queue));
@@ -1120,10 +1120,10 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net 


	rtw_set_signal_stat_timer(&padapter->recvpriv);



	padapter->recvpriv.signal_strength = ptarget_wlan->network.phy_info.SignalStrength;

	padapter->recvpriv.signal_qual = ptarget_wlan->network.phy_info.SignalQuality;

	/* the ptarget_wlan->network.rssi is raw data, we use ptarget_wlan->network.phy_info.SignalStrength instead (has scaled) */

	padapter->recvpriv.rssi = translate_percentage_to_dbm(ptarget_wlan->network.phy_info.SignalStrength);

	padapter->recvpriv.signal_strength = ptarget_wlan->network.phy_info.signal_strength;

	padapter->recvpriv.signal_qual = ptarget_wlan->network.phy_info.signal_quality;

	/* the ptarget_wlan->network.rssi is raw data, we use ptarget_wlan->network.phy_info.signal_strength instead (has scaled) */

	padapter->recvpriv.rssi = translate_percentage_to_dbm(ptarget_wlan->network.phy_info.signal_strength);



	rtw_set_signal_stat_timer(&padapter->recvpriv);

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+4 −4
Original line number Diff line number Diff line
@@ -3995,8 +3995,8 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str 


	/* get the signal strength */

	bssid->rssi = precv_frame->u.hdr.attrib.phy_info.RecvSignalPower; /*  in dBM.raw data */

	bssid->phy_info.SignalQuality = precv_frame->u.hdr.attrib.phy_info.SignalQuality;/* in percentage */

	bssid->phy_info.SignalStrength = precv_frame->u.hdr.attrib.phy_info.SignalStrength;/* in percentage */

	bssid->phy_info.signal_quality = precv_frame->u.hdr.attrib.phy_info.SignalQuality;/* in percentage */

	bssid->phy_info.signal_strength = precv_frame->u.hdr.attrib.phy_info.SignalStrength;/* in percentage */



	/*  checking SSID */

	p = rtw_get_ie(bssid->ies + ie_offset, WLAN_EID_SSID, &len, bssid->ie_length - ie_offset);
@@ -4095,9 +4095,9 @@ u8 collect_bss_info(struct adapter *padapter, union recv_frame *precv_frame, str 
			pmlmepriv->num_sta_no_ht++;

	}



	/*  mark bss info receiving from nearby channel as SignalQuality 101 */

	/*  mark bss info receiving from nearby channel as signal_quality 101 */

	if (bssid->configuration.ds_config != rtw_get_oper_ch(padapter))

		bssid->phy_info.SignalQuality = 101;

		bssid->phy_info.signal_quality = 101;



	return _SUCCESS;

}

drivers/staging/rtl8723bs/include/wlan_bssdef.h

+4 −4
Original line number Diff line number Diff line
@@ -143,10 +143,10 @@ struct ndis_802_11_wep { 
#endif



struct wlan_phy_info {

	u8 SignalStrength;/* in percentage) */

	u8 SignalQuality;/* in percentage) */

	u8 Optimum_antenna;  /* for Antenna diversity */

	u8 Reserved_0;

	u8 signal_strength;/* in percentage) */

	u8 signal_quality;/* in percentage) */

	u8 optimum_antenna;  /* for Antenna diversity */

	u8 reserved_0;

};



struct wlan_bcn_info {

drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl 
		is_same_network(&pmlmepriv->cur_network.network, &pnetwork->network, 0)) {

		notify_signal = 100*translate_percentage_to_dbm(padapter->recvpriv.signal_strength);/* dbm */

	} else {

		notify_signal = 100*translate_percentage_to_dbm(pnetwork->network.phy_info.SignalStrength);/* dbm */

		notify_signal = 100*translate_percentage_to_dbm(pnetwork->network.phy_info.signal_strength);/* dbm */

	}



	buf = kzalloc(MAX_BSSINFO_LEN, GFP_ATOMIC);

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c

+2 −2
Original line number Diff line number Diff line
@@ -303,8 +303,8 @@ static char *translate_scan(struct adapter *padapter, 
		ss = padapter->recvpriv.signal_strength;

		sq = padapter->recvpriv.signal_qual;

	} else {

		ss = pnetwork->network.phy_info.SignalStrength;

		sq = pnetwork->network.phy_info.SignalQuality;

		ss = pnetwork->network.phy_info.signal_strength;

		sq = pnetwork->network.phy_info.signal_quality;

	}