Signed-off-by: Mike McCormack <mikem@xxxxxxxxxx> --- drivers/staging/rtl8192e/r8192E.h | 20 -------------------- drivers/staging/rtl8192e/r8192E_core.c | 15 ++------------- 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h index 59d14a3..b9fe886 100644 --- a/drivers/staging/rtl8192e/r8192E.h +++ b/drivers/staging/rtl8192e/r8192E.h @@ -1029,36 +1029,22 @@ typedef struct r8192_priv struct proc_dir_entry *dir_dev; /* RX stuff */ - struct sk_buff_head rx_queue; struct sk_buff_head skb_queue; struct work_struct qos_activate; - short tx_urb_index; - atomic_t tx_pending[0x10];//UART_PRIORITY+1 - - struct urb *rxurb_task; //2 Tx Related variables u16 ShortRetryLimit; u16 LongRetryLimit; - u32 TransmitConfig; - u8 RegCWinMin; // For turbo mode CW adaptive. Added by Annie, 2005-10-27. u32 LastRxDescTSFHigh; u32 LastRxDescTSFLow; //2 Rx Related variables - u16 EarlyRxThreshold; u32 ReceiveConfig; - u8 AcmControl; - - u8 RFProgType; u8 retry_data; u8 retry_rts; - u16 rts; - - struct ChnlAccessSetting ChannelAccessSetting; struct work_struct reset_wq; @@ -1074,23 +1060,17 @@ typedef struct r8192_priv /*Firmware*/ prt_firmware pFirmware; rtl819x_loopback_e LoopbackMode; - firmware_source_e firmware_source; bool AutoloadFailFlag; - u16 EEPROMTxPowerDiff; u16 EEPROMAntPwDiff; // Antenna gain offset from B/C/D to A u8 EEPROMThermalMeter; - u8 EEPROMPwDiff; u8 EEPROMCrystalCap; - u8 EEPROM_Def_Ver; u8 EEPROMTxPowerLevelCCK[14];// CCK channel 1~14 // The following definition is for eeprom 93c56 u8 EEPROMRfACCKChnl1TxPwLevel[3]; //RF-A CCK Tx Power Level at channel 7 u8 EEPROMRfAOfdmChnlTxPwLevel[3];//RF-A CCK Tx Power Level at [0],[1],[2] = channel 1,7,13 u8 EEPROMRfCCCKChnl1TxPwLevel[3]; //RF-C CCK Tx Power Level at channel 7 u8 EEPROMRfCOfdmChnlTxPwLevel[3];//RF-C CCK Tx Power Level at [0],[1],[2] = channel 1,7,13 - u8 EEPROMTxPowerLevelCCK_V1[3]; u8 EEPROMTxPowerLevelOFDM24G[14]; // OFDM 2.4G channel 1~14 - u8 EEPROMTxPowerLevelOFDM5G[24]; // OFDM 5G u8 EEPROMLegacyHTTxPowerDiff; // Legacy to HT rate power diff bool bTXPowerDataReadFromEEPORM; /*channel plan*/ diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index 441b50b..eb7e0e1 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -596,10 +596,6 @@ static int proc_get_stats_tx(char *page, char **start, netif_queue_stopped(dev), priv->stats.txoverflow, // priv->stats.txbeacon, -// atomic_read(&(priv->tx_pending[VI_QUEUE])), -// atomic_read(&(priv->tx_pending[VO_QUEUE])), -// atomic_read(&(priv->tx_pending[BE_QUEUE])), -// atomic_read(&(priv->tx_pending[BK_QUEUE])), // read_nic_byte(dev, TXFIFOCOUNT), // priv->stats.txvidrop, // priv->stats.txvodrop, @@ -2254,13 +2250,8 @@ static void rtl8192_init_priv_variable(struct net_device* dev) priv->ieee80211->SetHwRegHandler = rtl8192e_SetHwReg; priv->ieee80211->rtllib_ap_sec_type = rtl8192e_ap_sec_type; - { - priv->ShortRetryLimit = 0x30; - priv->LongRetryLimit = 0x30; - } - priv->EarlyRxThreshold = 7; - - priv->TransmitConfig = 0; + priv->ShortRetryLimit = 0x30; + priv->LongRetryLimit = 0x30; priv->ReceiveConfig = RCR_ADD3 | RCR_AMF | RCR_ADF | //accept management/data @@ -2274,11 +2265,9 @@ static void rtl8192_init_priv_variable(struct net_device* dev) IMR_BDOK | IMR_RXCMDOK | IMR_TIMEOUT0 | IMR_RDU | IMR_RXFOVW | IMR_TXFOVW | IMR_BcnInt | IMR_TBDOK | IMR_TBDER); - priv->AcmControl = 0; priv->pFirmware = vzalloc(sizeof(rt_firmware)); /* rx related queue */ - skb_queue_head_init(&priv->rx_queue); skb_queue_head_init(&priv->skb_queue); /* Tx related queue */ -- 1.7.0.4 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel