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

Commit e6deaf81 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8192c: rtl8192ce: rtl8192cu: rtl8192de: rtl8723ae: Add changes... 


rtlwifi: rtl8192c: rtl8192ce: rtl8192cu: rtl8192de: rtl8723ae: Add changes required by adding rtl81988ee

This patch combines the remaining changes in the rtlwifi family to handle
the addition of rtl8188ee. A number of these changes eliminate some CamelCase
variable names, and other shorten common variable names so that long lines
in the new driver could be shortened.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: jcheung@suse.com
Cc: machen@suse.com
Cc: mmarek@suse.cz
Cc: zhiyuan_yang@realsil.com.cn
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f0eb856e

drivers/net/wireless/rtlwifi/base.c

+1 −0
Original line number Diff line number Diff line
@@ -473,6 +473,7 @@ int rtl_init_core(struct ieee80211_hw *hw) 
	spin_lock_init(&rtlpriv->locks.rf_lock);

	spin_lock_init(&rtlpriv->locks.waitq_lock);

	spin_lock_init(&rtlpriv->locks.entry_list_lock);

	spin_lock_init(&rtlpriv->locks.fw_ps_lock);

	spin_lock_init(&rtlpriv->locks.cck_and_rw_pagea_lock);

	spin_lock_init(&rtlpriv->locks.check_sendpkt_lock);

	spin_lock_init(&rtlpriv->locks.fw_ps_lock);

drivers/net/wireless/rtlwifi/debug.h

+4 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ 


/* Define init check for module bit*/

#define	INIT_EEPROM			BIT(0)

#define	INIT_TxPower		BIT(1)

#define	INIT_TXPOWER			BIT(1)

#define	INIT_IQK			BIT(2)

#define	INIT_RF				BIT(3)
@@ -142,6 +142,8 @@ 
#define DM_DIG				BIT(3)

#define DM_EDCA_TURBO			BIT(4)



#define DM_PWDB				BIT(1)



enum dbgp_flag_e {

	FQOS = 0,

	FTX = 1,

drivers/net/wireless/rtlwifi/efuse.h

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 


#define EFUSE_IC_ID_OFFSET		506



#define EFUSE_REAL_CONTENT_LEN		512

#define EFUSE_MAP_LEN			128

#define EFUSE_MAX_WORD_UNIT		4

drivers/net/wireless/rtlwifi/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id) 
		RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE, "beacon interrupt!\n");

	}



	if (inta & rtlpriv->cfg->maps[RTL_IMR_BcnInt]) {

	if (inta & rtlpriv->cfg->maps[RTL_IMR_BCNINT]) {

		RT_TRACE(rtlpriv, COMP_INTR, DBG_TRACE,

			 "prepare beacon for interrupt!\n");

		tasklet_schedule(&rtlpriv->works.irq_prepare_bcn_tasklet);

drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c

+6 −6
Original line number Diff line number Diff line
@@ -174,8 +174,8 @@ static void rtl92c_dm_diginit(struct ieee80211_hw *hw) 
	dm_digtable->rssi_highthresh = DM_DIG_THRESH_HIGH;

	dm_digtable->fa_lowthresh = DM_FALSEALARM_THRESH_LOW;

	dm_digtable->fa_highthresh = DM_FALSEALARM_THRESH_HIGH;

	dm_digtable->rx_gain_range_max = DM_DIG_MAX;

	dm_digtable->rx_gain_range_min = DM_DIG_MIN;

	dm_digtable->rx_gain_max = DM_DIG_MAX;

	dm_digtable->rx_gain_min = DM_DIG_MIN;

	dm_digtable->back_val = DM_DIG_BACKOFF_DEFAULT;

	dm_digtable->back_range_max = DM_DIG_BACKOFF_MAX;

	dm_digtable->back_range_min = DM_DIG_BACKOFF_MIN;
@@ -300,11 +300,11 @@ static void rtl92c_dm_ctrl_initgain_by_rssi(struct ieee80211_hw *hw) 
	}



	if ((digtable->rssi_val_min + 10 - digtable->back_val) >

	    digtable->rx_gain_range_max)

		digtable->cur_igvalue = digtable->rx_gain_range_max;

	    digtable->rx_gain_max)

		digtable->cur_igvalue = digtable->rx_gain_max;

	else if ((digtable->rssi_val_min + 10 -

		  digtable->back_val) < digtable->rx_gain_range_min)

		digtable->cur_igvalue = digtable->rx_gain_range_min;

		  digtable->back_val) < digtable->rx_gain_min)

		digtable->cur_igvalue = digtable->rx_gain_min;

	else

		digtable->cur_igvalue = digtable->rssi_val_min + 10 -

		    digtable->back_val;