diff options
author | Mike McCormack <mikem@ring3k.org> | 2011-01-24 09:18:22 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-24 17:34:40 -0500 |
commit | 79694ebbe04b08262ef307da73b5c6736938eb8c (patch) | |
tree | e07055febc2041202683ebd7b4a7b50597e2d343 /drivers | |
parent | 73dbd9f3a4d3c47f514fda5997322f2cbb8219e3 (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/rtl8192e/r8192E.h | 16 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/r8192E_core.c | 10 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/r8192E_wx.c | 2 |
3 files changed, 0 insertions, 28 deletions
diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h index 2fa25adff98..064ae0c1e25 100644 --- a/drivers/staging/rtl8192e/r8192E.h +++ b/drivers/staging/rtl8192e/r8192E.h | |||
@@ -966,7 +966,6 @@ typedef struct r8192_priv | |||
966 | u16 eeprom_ChannelPlan; | 966 | u16 eeprom_ChannelPlan; |
967 | RT_CUSTOMER_ID CustomerID; | 967 | RT_CUSTOMER_ID CustomerID; |
968 | LED_STRATEGY_8190 LedStrategy; | 968 | LED_STRATEGY_8190 LedStrategy; |
969 | //bool bDcut; | ||
970 | u8 IC_Cut; | 969 | u8 IC_Cut; |
971 | int irq; | 970 | int irq; |
972 | short irq_enabled; | 971 | short irq_enabled; |
@@ -980,12 +979,6 @@ typedef struct r8192_priv | |||
980 | u8 Rf_Mode; | 979 | u8 Rf_Mode; |
981 | short card_8192; /* O: rtl8192, 1:rtl8185 V B/C, 2:rtl8185 V D */ | 980 | short card_8192; /* O: rtl8192, 1:rtl8185 V B/C, 2:rtl8185 V D */ |
982 | u8 card_8192_version; /* if TCR reports card V B/C this discriminates */ | 981 | u8 card_8192_version; /* if TCR reports card V B/C this discriminates */ |
983 | // short phy_ver; /* meaningful for rtl8225 1:A 2:B 3:C */ | ||
984 | short enable_gpio0; | ||
985 | enum card_type {PCI,MINIPCI,CARDBUS,USB/*rtl8187*/}card_type; | ||
986 | short hw_plcp_len; | ||
987 | short plcp_preamble_mode; | ||
988 | u8 ScanDelay; | ||
989 | spinlock_t irq_th_lock; | 982 | spinlock_t irq_th_lock; |
990 | spinlock_t tx_lock; | 983 | spinlock_t tx_lock; |
991 | spinlock_t rf_ps_lock; | 984 | spinlock_t rf_ps_lock; |
@@ -997,8 +990,6 @@ typedef struct r8192_priv | |||
997 | // struct net_device *dev; //comment this out. | 990 | // struct net_device *dev; //comment this out. |
998 | short chan; | 991 | short chan; |
999 | short sens; | 992 | short sens; |
1000 | short max_sens; | ||
1001 | u32 rx_prevlen; | ||
1002 | /*RX stuff*/ | 993 | /*RX stuff*/ |
1003 | rx_desc_819x_pci *rx_ring; | 994 | rx_desc_819x_pci *rx_ring; |
1004 | dma_addr_t rx_ring_dma; | 995 | dma_addr_t rx_ring_dma; |
@@ -1024,13 +1015,6 @@ typedef struct r8192_priv | |||
1024 | struct tasklet_struct irq_rx_tasklet; | 1015 | struct tasklet_struct irq_rx_tasklet; |
1025 | struct tasklet_struct irq_tx_tasklet; | 1016 | struct tasklet_struct irq_tx_tasklet; |
1026 | struct tasklet_struct irq_prepare_beacon_tasklet; | 1017 | struct tasklet_struct irq_prepare_beacon_tasklet; |
1027 | /* adhoc/master mode stuff */ | ||
1028 | ptx_ring txbeaconringtail; | ||
1029 | dma_addr_t txbeaconringdma; | ||
1030 | ptx_ring txbeaconring; | ||
1031 | int txbeaconcount; | ||
1032 | struct buffer *txbeaconbufs; | ||
1033 | struct buffer *txbeaconbufstail; | ||
1034 | // u8 chtxpwr[15]; //channels from 1 to 14, 0 not used | 1018 | // u8 chtxpwr[15]; //channels from 1 to 14, 0 not used |
1035 | // u8 chtxpwr_ofdm[15]; //channels from 1 to 14, 0 not used | 1019 | // u8 chtxpwr_ofdm[15]; //channels from 1 to 14, 0 not used |
1036 | // u8 cck_txpwr_base; | 1020 | // u8 cck_txpwr_base; |
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index cf5d82840af..441b50b6a6d 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c | |||
@@ -2151,8 +2151,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev) | |||
2151 | 2151 | ||
2152 | priv->being_init_adapter = false; | 2152 | priv->being_init_adapter = false; |
2153 | priv->txringcount = 64;//32; | 2153 | priv->txringcount = 64;//32; |
2154 | //priv->txbeaconcount = priv->txringcount; | ||
2155 | priv->txbeaconcount = 2; | ||
2156 | priv->rxbuffersize = 9100;//2048;//1024; | 2154 | priv->rxbuffersize = 9100;//2048;//1024; |
2157 | priv->rxringcount = MAX_RX_COUNT;//64; | 2155 | priv->rxringcount = MAX_RX_COUNT;//64; |
2158 | priv->irq_enabled=0; | 2156 | priv->irq_enabled=0; |
@@ -2180,7 +2178,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev) | |||
2180 | priv->rfa_txpowertrackingindex = 0; | 2178 | priv->rfa_txpowertrackingindex = 0; |
2181 | priv->rfc_txpowertrackingindex = 0; | 2179 | priv->rfc_txpowertrackingindex = 0; |
2182 | priv->CckPwEnl = 6; | 2180 | priv->CckPwEnl = 6; |
2183 | priv->ScanDelay = 50;//for Scan TODO | ||
2184 | //added by amy for silent reset | 2181 | //added by amy for silent reset |
2185 | priv->ResetProgress = RESET_TYPE_NORESET; | 2182 | priv->ResetProgress = RESET_TYPE_NORESET; |
2186 | priv->bForcedSilentReset = 0; | 2183 | priv->bForcedSilentReset = 0; |
@@ -2257,13 +2254,11 @@ static void rtl8192_init_priv_variable(struct net_device* dev) | |||
2257 | priv->ieee80211->SetHwRegHandler = rtl8192e_SetHwReg; | 2254 | priv->ieee80211->SetHwRegHandler = rtl8192e_SetHwReg; |
2258 | priv->ieee80211->rtllib_ap_sec_type = rtl8192e_ap_sec_type; | 2255 | priv->ieee80211->rtllib_ap_sec_type = rtl8192e_ap_sec_type; |
2259 | 2256 | ||
2260 | priv->card_type = USB; | ||
2261 | { | 2257 | { |
2262 | priv->ShortRetryLimit = 0x30; | 2258 | priv->ShortRetryLimit = 0x30; |
2263 | priv->LongRetryLimit = 0x30; | 2259 | priv->LongRetryLimit = 0x30; |
2264 | } | 2260 | } |
2265 | priv->EarlyRxThreshold = 7; | 2261 | priv->EarlyRxThreshold = 7; |
2266 | priv->enable_gpio0 = 0; | ||
2267 | 2262 | ||
2268 | priv->TransmitConfig = 0; | 2263 | priv->TransmitConfig = 0; |
2269 | 2264 | ||
@@ -2773,7 +2768,6 @@ static void rtl8192_read_eeprom_info(struct net_device* dev) | |||
2773 | priv->ChannelPlan); | 2768 | priv->ChannelPlan); |
2774 | break; | 2769 | break; |
2775 | case EEPROM_CID_Nettronix: | 2770 | case EEPROM_CID_Nettronix: |
2776 | priv->ScanDelay = 100; //cosa add for scan | ||
2777 | priv->CustomerID = RT_CID_Nettronix; | 2771 | priv->CustomerID = RT_CID_Nettronix; |
2778 | break; | 2772 | break; |
2779 | case EEPROM_CID_Pronet: | 2773 | case EEPROM_CID_Pronet: |
@@ -6041,10 +6035,6 @@ static void __devexit rtl8192_pci_disconnect(struct pci_dev *pdev) | |||
6041 | 6035 | ||
6042 | } | 6036 | } |
6043 | 6037 | ||
6044 | |||
6045 | |||
6046 | // free_beacon_desc_ring(dev,priv->txbeaconcount); | ||
6047 | |||
6048 | #ifdef CONFIG_RTL8180_IO_MAP | 6038 | #ifdef CONFIG_RTL8180_IO_MAP |
6049 | 6039 | ||
6050 | if( dev->base_addr != 0 ){ | 6040 | if( dev->base_addr != 0 ){ |
diff --git a/drivers/staging/rtl8192e/r8192E_wx.c b/drivers/staging/rtl8192e/r8192E_wx.c index 5ae65164af5..15b08013aae 100644 --- a/drivers/staging/rtl8192e/r8192E_wx.c +++ b/drivers/staging/rtl8192e/r8192E_wx.c | |||
@@ -301,8 +301,6 @@ static int rtl8180_wx_get_range(struct net_device *dev, | |||
301 | // range->old_num_channels; | 301 | // range->old_num_channels; |
302 | // range->old_num_frequency; | 302 | // range->old_num_frequency; |
303 | // range->old_freq[6]; /* Filler to keep "version" at the same offset */ | 303 | // range->old_freq[6]; /* Filler to keep "version" at the same offset */ |
304 | if(priv->rf_set_sens != NULL) | ||
305 | range->sensitivity = priv->max_sens; /* signal level threshold range */ | ||
306 | 304 | ||
307 | range->max_qual.qual = 100; | 305 | range->max_qual.qual = 100; |
308 | /* TODO: Find real max RSSI and stick here */ | 306 | /* TODO: Find real max RSSI and stick here */ |