mirror of https://gitee.com/openkylin/linux.git
staging: rtl8192e: Remove unused members from r8192_priv
Signed-off-by: Mike McCormack <mikem@ring3k.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
73dbd9f3a4
commit
79694ebbe0
|
@ -966,7 +966,6 @@ typedef struct r8192_priv
|
|||
u16 eeprom_ChannelPlan;
|
||||
RT_CUSTOMER_ID CustomerID;
|
||||
LED_STRATEGY_8190 LedStrategy;
|
||||
//bool bDcut;
|
||||
u8 IC_Cut;
|
||||
int irq;
|
||||
short irq_enabled;
|
||||
|
@ -980,12 +979,6 @@ typedef struct r8192_priv
|
|||
u8 Rf_Mode;
|
||||
short card_8192; /* O: rtl8192, 1:rtl8185 V B/C, 2:rtl8185 V D */
|
||||
u8 card_8192_version; /* if TCR reports card V B/C this discriminates */
|
||||
// short phy_ver; /* meaningful for rtl8225 1:A 2:B 3:C */
|
||||
short enable_gpio0;
|
||||
enum card_type {PCI,MINIPCI,CARDBUS,USB/*rtl8187*/}card_type;
|
||||
short hw_plcp_len;
|
||||
short plcp_preamble_mode;
|
||||
u8 ScanDelay;
|
||||
spinlock_t irq_th_lock;
|
||||
spinlock_t tx_lock;
|
||||
spinlock_t rf_ps_lock;
|
||||
|
@ -997,8 +990,6 @@ typedef struct r8192_priv
|
|||
// struct net_device *dev; //comment this out.
|
||||
short chan;
|
||||
short sens;
|
||||
short max_sens;
|
||||
u32 rx_prevlen;
|
||||
/*RX stuff*/
|
||||
rx_desc_819x_pci *rx_ring;
|
||||
dma_addr_t rx_ring_dma;
|
||||
|
@ -1024,13 +1015,6 @@ typedef struct r8192_priv
|
|||
struct tasklet_struct irq_rx_tasklet;
|
||||
struct tasklet_struct irq_tx_tasklet;
|
||||
struct tasklet_struct irq_prepare_beacon_tasklet;
|
||||
/* adhoc/master mode stuff */
|
||||
ptx_ring txbeaconringtail;
|
||||
dma_addr_t txbeaconringdma;
|
||||
ptx_ring txbeaconring;
|
||||
int txbeaconcount;
|
||||
struct buffer *txbeaconbufs;
|
||||
struct buffer *txbeaconbufstail;
|
||||
// u8 chtxpwr[15]; //channels from 1 to 14, 0 not used
|
||||
// u8 chtxpwr_ofdm[15]; //channels from 1 to 14, 0 not used
|
||||
// u8 cck_txpwr_base;
|
||||
|
|
|
@ -2151,8 +2151,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
|
|||
|
||||
priv->being_init_adapter = false;
|
||||
priv->txringcount = 64;//32;
|
||||
//priv->txbeaconcount = priv->txringcount;
|
||||
priv->txbeaconcount = 2;
|
||||
priv->rxbuffersize = 9100;//2048;//1024;
|
||||
priv->rxringcount = MAX_RX_COUNT;//64;
|
||||
priv->irq_enabled=0;
|
||||
|
@ -2180,7 +2178,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
|
|||
priv->rfa_txpowertrackingindex = 0;
|
||||
priv->rfc_txpowertrackingindex = 0;
|
||||
priv->CckPwEnl = 6;
|
||||
priv->ScanDelay = 50;//for Scan TODO
|
||||
//added by amy for silent reset
|
||||
priv->ResetProgress = RESET_TYPE_NORESET;
|
||||
priv->bForcedSilentReset = 0;
|
||||
|
@ -2257,13 +2254,11 @@ 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->card_type = USB;
|
||||
{
|
||||
priv->ShortRetryLimit = 0x30;
|
||||
priv->LongRetryLimit = 0x30;
|
||||
}
|
||||
priv->EarlyRxThreshold = 7;
|
||||
priv->enable_gpio0 = 0;
|
||||
|
||||
priv->TransmitConfig = 0;
|
||||
|
||||
|
@ -2773,7 +2768,6 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
|
|||
priv->ChannelPlan);
|
||||
break;
|
||||
case EEPROM_CID_Nettronix:
|
||||
priv->ScanDelay = 100; //cosa add for scan
|
||||
priv->CustomerID = RT_CID_Nettronix;
|
||||
break;
|
||||
case EEPROM_CID_Pronet:
|
||||
|
@ -6041,10 +6035,6 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev)
|
|||
|
||||
}
|
||||
|
||||
|
||||
|
||||
// free_beacon_desc_ring(dev,priv->txbeaconcount);
|
||||
|
||||
#ifdef CONFIG_RTL8180_IO_MAP
|
||||
|
||||
if( dev->base_addr != 0 ){
|
||||
|
|
|
@ -301,8 +301,6 @@ static int rtl8180_wx_get_range(struct net_device *dev,
|
|||
// range->old_num_channels;
|
||||
// range->old_num_frequency;
|
||||
// range->old_freq[6]; /* Filler to keep "version" at the same offset */
|
||||
if(priv->rf_set_sens != NULL)
|
||||
range->sensitivity = priv->max_sens; /* signal level threshold range */
|
||||
|
||||
range->max_qual.qual = 100;
|
||||
/* TODO: Find real max RSSI and stick here */
|
||||
|
|
Loading…
Reference in New Issue