Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2865af35 authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: rename AntDivCompare8188E to rtw_hal_antdiv_rssi_compared 



And remove two one-line wrappers.

Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 76098bcb

drivers/staging/rtl8188eu/hal/hal_intf.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -131,14 +131,6 @@ u8 rtw_hal_antdiv_before_linked(struct adapter *adapt) 
	return false;

	return false;

}

}





void rtw_hal_antdiv_rssi_compared(struct adapter *adapt,

				  struct wlan_bssid_ex *dst,

				  struct wlan_bssid_ex *src)

{

	if (adapt->HalFunc.AntDivCompareHandler)

		adapt->HalFunc.AntDivCompareHandler(adapt, dst, src);

}



void rtw_hal_reset_security_engine(struct adapter *adapter)

void rtw_hal_reset_security_engine(struct adapter *adapter)

{

{

	if (adapter->HalFunc.hal_reset_security_engine)

	if (adapter->HalFunc.hal_reset_security_engine)

drivers/staging/rtl8188eu/hal/rtl8188e_dm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -187,7 +187,7 @@ void rtl8188e_init_dm_priv(struct adapter *Adapter) 




/*  Add new function to reset the state of antenna diversity before link. */

/*  Add new function to reset the state of antenna diversity before link. */

/*  Compare RSSI for deciding antenna */

/*  Compare RSSI for deciding antenna */

void AntDivCompare8188E(struct adapter *Adapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src)

void rtw_hal_antdiv_rssi_compared(struct adapter *Adapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src)

{

{

	struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter);

	struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter);

drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -201,7 +201,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc) 
	pHalFunc->Add_RateATid = &rtl8188e_Add_RateATid;

	pHalFunc->Add_RateATid = &rtl8188e_Add_RateATid;





	pHalFunc->AntDivBeforeLinkHandler = &AntDivBeforeLink8188E;

	pHalFunc->AntDivBeforeLinkHandler = &AntDivBeforeLink8188E;

	pHalFunc->AntDivCompareHandler = &AntDivCompare8188E;

}

}





/*  */

/*  */

drivers/staging/rtl8188eu/include/hal_intf.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -158,9 +158,6 @@ struct hal_ops { 
				u8 rssi_level);

				u8 rssi_level);





	u8	(*AntDivBeforeLinkHandler)(struct adapter *adapter);

	u8	(*AntDivBeforeLinkHandler)(struct adapter *adapter);

	void	(*AntDivCompareHandler)(struct adapter *adapter,

					struct wlan_bssid_ex *dst,

					struct wlan_bssid_ex *src);





	void (*hal_reset_security_engine)(struct adapter *adapter);

	void (*hal_reset_security_engine)(struct adapter *adapter);

};

};