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

Commit eea72050 authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Pass rtl8192_priv to dm functions 



Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1e04ca7a

drivers/staging/rtl8192e/r8192E_core.c

+4 −5
Original line number Diff line number Diff line
@@ -2292,7 +2292,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv) 


	// 2008/01/16 MH We can only know RF type in the function. So we have to init

	// DIG RATR table again.

	init_rate_adaptive(dev);

	init_rate_adaptive(priv);



	//1 Make a copy for following variables and we can change them if we want
@@ -2408,7 +2408,7 @@ static short rtl8192_init(struct r8192_priv *priv) 
	rtl8192_get_eeprom_size(priv);

	rtl8192_read_eeprom_info(priv);

	rtl8192_get_channel_map(priv);

	init_hal_dm(dev);

	init_hal_dm(priv);

	init_timer(&priv->watch_dog_timer);

	priv->watch_dog_timer.data = (unsigned long)priv;

	priv->watch_dog_timer.function = watch_dog_timer_callback;
@@ -3228,7 +3228,6 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work) 
{

	struct delayed_work *dwork = container_of(work,struct delayed_work,work);

       struct r8192_priv *priv = container_of(dwork,struct r8192_priv,watch_dog_wq);

	struct net_device *dev = priv->ieee80211->dev;

	struct ieee80211_device* ieee = priv->ieee80211;

	RESET_TYPE	ResetType = RESET_TYPE_NORESET;

	bool bBusyTraffic = false;
@@ -3239,7 +3238,7 @@ static void rtl819x_watchdog_wqcallback(struct work_struct *work) 


	if(!priv->up)

		return;

	hal_dm_watchdog(dev);

	hal_dm_watchdog(priv);

#ifdef ENABLE_IPS

	if(ieee->actscanning == false){

		if((ieee->iw_mode == IW_MODE_INFRA) && (ieee->state == IEEE80211_NOLINK) &&
@@ -3452,7 +3451,7 @@ int rtl8192_down(struct net_device *dev) 


	rtl8192_irq_disable(priv);

	rtl8192_cancel_deferred_work(priv);

	deinit_hal_dm(dev);

	deinit_hal_dm(priv);

	del_timer_sync(&priv->watch_dog_timer);



	ieee80211_softmac_stop_protocol(priv->ieee80211,true);

drivers/staging/rtl8192e/r8192E_dm.c

+6 −13
Original line number Diff line number Diff line
@@ -95,16 +95,14 @@ static void dm_fsync_timer_callback(unsigned long data); 
 * Prepare SW resource for HW dynamic mechanism.

 * This function is only invoked at driver intialization once.

 */

void init_hal_dm(struct net_device *dev)

void init_hal_dm(struct r8192_priv *priv)

{

	struct r8192_priv *priv = ieee80211_priv(dev);



	// Undecorated Smoothed Signal Strength, it can utilized to dynamic mechanism.

	priv->undecorated_smoothed_pwdb = -1;



	//Initial TX Power Control for near/far range , add by amy 2008/05/15, porting from windows code.

	dm_init_dynamic_txpower(priv);

	init_rate_adaptive(dev);

	init_rate_adaptive(priv);

	//dm_initialize_txpower_tracking(dev);

	dm_dig_init(priv);

	dm_init_edca_turbo(priv);
@@ -116,16 +114,13 @@ void init_hal_dm(struct net_device *dev) 


}



void deinit_hal_dm(struct net_device *dev)

void deinit_hal_dm(struct r8192_priv *priv)

{

	struct r8192_priv *priv = ieee80211_priv(dev);



	dm_deInit_fsync(priv);

}



void hal_dm_watchdog(struct net_device *dev)

void hal_dm_watchdog(struct r8192_priv *priv)

{

	struct r8192_priv *priv = ieee80211_priv(dev);



	/*Add by amy 2008/05/15 ,porting from windows code.*/

	dm_check_rate_adaptive(priv);
@@ -154,11 +149,9 @@ void hal_dm_watchdog(struct net_device *dev) 
  *	01/16/2008	MHC		RF_Type is assigned in ReadAdapterInfo(). We must call

  *						the function after making sure RF_Type.

  */

void init_rate_adaptive(struct net_device * dev)

void init_rate_adaptive(struct r8192_priv *priv)

{



	struct r8192_priv *priv = ieee80211_priv(dev);

	prate_adaptive			pra = (prate_adaptive)&priv->rate_adaptive;

	prate_adaptive pra = &priv->rate_adaptive;



	pra->ratr_state = DM_RATR_STA_MAX;

	pra->high2low_rssi_thresh_for_ra = RateAdaptiveTH_High;

drivers/staging/rtl8192e/r8192E_dm.h

+4 −4
Original line number Diff line number Diff line
@@ -212,12 +212,12 @@ typedef struct tag_Tx_Config_Cmd_Format 
extern dig_t dm_digtable;

extern DRxPathSel DM_RxPathSelTable;



void init_hal_dm(struct net_device *dev);

void deinit_hal_dm(struct net_device *dev);

void init_hal_dm(struct r8192_priv *priv);

void deinit_hal_dm(struct r8192_priv *priv);



void hal_dm_watchdog(struct net_device *dev);

void hal_dm_watchdog(struct r8192_priv *priv);



void init_rate_adaptive(struct net_device *dev);

void init_rate_adaptive(struct r8192_priv *priv);

void dm_txpower_trackingcallback(struct work_struct *work);

void dm_rf_pathcheck_workitemcallback(struct work_struct *work);

void dm_initialize_txpower_tracking(struct r8192_priv *priv);