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

staging: rtl8192e: Pass r8192_priv around instead of net_device 



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

drivers/staging/rtl8192e/r8192E.h

+0 −1
Original line number Diff line number Diff line
@@ -1062,7 +1062,6 @@ void write_phy(struct net_device *dev, u8 adr, u8 data); 
void CamResetAllEntry(struct r8192_priv *priv);

void EnableHWSecurityConfig8192(struct net_device *dev);

void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent );

void dm_cck_txpower_adjust(struct net_device *dev, bool binch14);

void firmware_init_param(struct net_device *dev);

RT_STATUS cmpk_message_handle_tx(struct net_device *dev, u8* codevirtualaddress, u32 packettype, u32 buffer_len);

drivers/staging/rtl8192e/r8192E_core.c

+1 −1
Original line number Diff line number Diff line
@@ -2832,7 +2832,7 @@ static RT_STATUS rtl8192_adapter_start(struct r8192_priv *priv) 


	if(priv->ResetProgress == RESET_TYPE_NORESET)

	{

		dm_initialize_txpower_tracking(dev);

		dm_initialize_txpower_tracking(priv);



		if(priv->IC_Cut >= IC_VersionCut_D)

		{

drivers/staging/rtl8192e/r8192E_dm.c

+133 −197

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/rtl8192e/r8192E_dm.h

+2 −5
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ void hal_dm_watchdog(struct net_device *dev); 


void init_rate_adaptive(struct net_device *dev);

void dm_txpower_trackingcallback(struct work_struct *work);

void dm_cck_txpower_adjust(struct net_device *dev,bool  binch14);

void dm_restore_dynamic_mechanism_state(struct net_device *dev);

void dm_backup_dynamic_mechanism_state(struct net_device *dev);

void dm_change_dynamic_initgain_thresh(struct net_device *dev, u32 dm_type,
@@ -227,12 +226,10 @@ void dm_change_dynamic_initgain_thresh(struct net_device *dev, u32 dm_type, 
void DM_ChangeFsyncSetting(struct net_device *dev, s32 DM_Type, s32 DM_Value);

void dm_force_tx_fw_info(struct net_device *dev, u32 force_type,

			 u32 force_value);

void dm_init_edca_turbo(struct net_device *dev);

void dm_rf_operation_test_callback(unsigned long data);

void dm_rf_pathcheck_workitemcallback(struct work_struct *work);

void dm_fsync_timer_callback(unsigned long data);

void dm_check_fsync(struct net_device *dev);

void dm_initialize_txpower_tracking(struct net_device *dev);

void dm_initialize_txpower_tracking(struct r8192_priv *priv);

void dm_cck_txpower_adjust(struct r8192_priv *priv, bool binch14);





#endif	/*__R8192UDM_H__ */

drivers/staging/rtl8192e/r819xE_phy.c

+7 −11
Original line number Diff line number Diff line
@@ -1907,8 +1907,6 @@ u8 rtl8192_phy_SwChnl(struct net_device* dev, u8 channel) 


static void CCK_Tx_Power_Track_BW_Switch_TSSI(struct r8192_priv *priv)

{

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



	switch(priv->CurrentChannelBW)

	{

		/* 20 MHz channel*/
@@ -1927,15 +1925,15 @@ static void CCK_Tx_Power_Track_BW_Switch_TSSI(struct r8192_priv *priv) 
			if(priv->ieee80211->current_network.channel== 14 && !priv->bcck_in_ch14)

			{

				priv->bcck_in_ch14 = TRUE;

				dm_cck_txpower_adjust(dev,priv->bcck_in_ch14);

				dm_cck_txpower_adjust(priv, priv->bcck_in_ch14);

			}

			else if(priv->ieee80211->current_network.channel != 14 && priv->bcck_in_ch14)

			{

				priv->bcck_in_ch14 = FALSE;

				dm_cck_txpower_adjust(dev,priv->bcck_in_ch14);

				dm_cck_txpower_adjust(priv, priv->bcck_in_ch14);

			}

			else

				dm_cck_txpower_adjust(dev,priv->bcck_in_ch14);

				dm_cck_txpower_adjust(priv, priv->bcck_in_ch14);

		break;



		/* 40 MHz channel*/
@@ -1953,23 +1951,21 @@ static void CCK_Tx_Power_Track_BW_Switch_TSSI(struct r8192_priv *priv) 
			if(priv->ieee80211->current_network.channel == 14 && !priv->bcck_in_ch14)

			{

				priv->bcck_in_ch14 = TRUE;

				dm_cck_txpower_adjust(dev,priv->bcck_in_ch14);

				dm_cck_txpower_adjust(priv, priv->bcck_in_ch14);

			}

			else if(priv->ieee80211->current_network.channel != 14 && priv->bcck_in_ch14)

			{

				priv->bcck_in_ch14 = FALSE;

				dm_cck_txpower_adjust(dev,priv->bcck_in_ch14);

				dm_cck_txpower_adjust(priv, priv->bcck_in_ch14);

			}

			else

				dm_cck_txpower_adjust(dev,priv->bcck_in_ch14);

				dm_cck_txpower_adjust(priv, priv->bcck_in_ch14);

		break;

	}

}



static void CCK_Tx_Power_Track_BW_Switch_ThermalMeter(struct r8192_priv *priv)

{

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



	if(priv->ieee80211->current_network.channel == 14 && !priv->bcck_in_ch14)

		priv->bcck_in_ch14 = TRUE;

	else if(priv->ieee80211->current_network.channel != 14 && priv->bcck_in_ch14)
@@ -1992,7 +1988,7 @@ static void CCK_Tx_Power_Track_BW_Switch_ThermalMeter(struct r8192_priv *priv) 
			RT_TRACE(COMP_POWER_TRACKING, "40MHz, CCK_Tx_Power_Track_BW_Switch_ThermalMeter(), CCK_index = %d\n", priv->CCK_index);

		break;

	}

	dm_cck_txpower_adjust(dev, priv->bcck_in_ch14);

	dm_cck_txpower_adjust(priv, priv->bcck_in_ch14);

}



static void CCK_Tx_Power_Track_BW_Switch(struct r8192_priv *priv)