diff options
author | Mike McCormack <mikem@ring3k.org> | 2011-03-03 08:47:16 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-07 16:31:45 -0500 |
commit | 73fdfd7b78bfa8b0735d39be82519e18ad2fdff8 (patch) | |
tree | 325123b096f5336f6f5fa736fb1d83ec45b0b18d /drivers/staging/rtl8192e | |
parent | 83969021b2133450e9f7b018ae28dd6afb9a10f4 (diff) |
staging: rtl8192e: Delete unused members from struct r8192_priv
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e')
-rw-r--r-- | drivers/staging/rtl8192e/r8192E.h | 13 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/r8192E_core.c | 40 | ||||
-rw-r--r-- | drivers/staging/rtl8192e/r819xE_phy.c | 2 |
3 files changed, 0 insertions, 55 deletions
diff --git a/drivers/staging/rtl8192e/r8192E.h b/drivers/staging/rtl8192e/r8192E.h index 1b838eea9aa..4571eaf9d0c 100644 --- a/drivers/staging/rtl8192e/r8192E.h +++ b/drivers/staging/rtl8192e/r8192E.h | |||
@@ -801,7 +801,6 @@ typedef struct r8192_priv | |||
801 | u8 eeprom_CustomerID; | 801 | u8 eeprom_CustomerID; |
802 | u16 eeprom_ChannelPlan; | 802 | u16 eeprom_ChannelPlan; |
803 | RT_CUSTOMER_ID CustomerID; | 803 | RT_CUSTOMER_ID CustomerID; |
804 | LED_STRATEGY_8190 LedStrategy; | ||
805 | u8 IC_Cut; | 804 | u8 IC_Cut; |
806 | int irq; | 805 | int irq; |
807 | struct ieee80211_device *ieee80211; | 806 | struct ieee80211_device *ieee80211; |
@@ -827,13 +826,6 @@ typedef struct r8192_priv | |||
827 | int rxringcount; | 826 | int rxringcount; |
828 | u16 rxbuffersize; | 827 | u16 rxbuffersize; |
829 | 828 | ||
830 | struct sk_buff *rx_skb; | ||
831 | u32 *rxring; | ||
832 | u32 *rxringtail; | ||
833 | dma_addr_t rxringdma; | ||
834 | struct buffer *rxbuffer; | ||
835 | struct buffer *rxbufferhead; | ||
836 | short rx_skb_complete; | ||
837 | /* TX stuff */ | 829 | /* TX stuff */ |
838 | struct rtl8192_tx_ring tx_ring[MAX_TX_QUEUE_COUNT]; | 830 | struct rtl8192_tx_ring tx_ring[MAX_TX_QUEUE_COUNT]; |
839 | int txringcount; | 831 | int txringcount; |
@@ -850,8 +842,6 @@ typedef struct r8192_priv | |||
850 | 842 | ||
851 | short (*rf_set_sens)(struct net_device *dev,short sens); | 843 | short (*rf_set_sens)(struct net_device *dev,short sens); |
852 | u8 (*rf_set_chan)(struct net_device *dev,u8 ch); | 844 | u8 (*rf_set_chan)(struct net_device *dev,u8 ch); |
853 | void (*rf_close)(struct net_device *dev); | ||
854 | void (*rf_init)(struct net_device *dev); | ||
855 | short promisc; | 845 | short promisc; |
856 | /* stats */ | 846 | /* stats */ |
857 | struct Stats stats; | 847 | struct Stats stats; |
@@ -923,8 +913,6 @@ typedef struct r8192_priv | |||
923 | u8 TxPowerLevelOFDM24G_A[14]; // RF-A, OFDM 2.4G channel 1~14 | 913 | u8 TxPowerLevelOFDM24G_A[14]; // RF-A, OFDM 2.4G channel 1~14 |
924 | u8 TxPowerLevelOFDM24G_C[14]; // RF-C, OFDM 2.4G channel 1~14 | 914 | u8 TxPowerLevelOFDM24G_C[14]; // RF-C, OFDM 2.4G channel 1~14 |
925 | u8 LegacyHTTxPowerDiff; // Legacy to HT rate power diff | 915 | u8 LegacyHTTxPowerDiff; // Legacy to HT rate power diff |
926 | u8 TxPowerDiff; | ||
927 | char RF_C_TxPwDiff; // Antenna gain offset, rf-c to rf-a | ||
928 | u8 AntennaTxPwDiff[3]; // Antenna gain offset, index 0 for B, 1 for C, and 2 for D | 916 | u8 AntennaTxPwDiff[3]; // Antenna gain offset, index 0 for B, 1 for C, and 2 for D |
929 | u8 CrystalCap; // CrystalCap. | 917 | u8 CrystalCap; // CrystalCap. |
930 | u8 ThermalMeter[2]; // ThermalMeter, index 0 for RFIC0, and 1 for RFIC1 | 918 | u8 ThermalMeter[2]; // ThermalMeter, index 0 for RFIC0, and 1 for RFIC1 |
@@ -966,7 +954,6 @@ typedef struct r8192_priv | |||
966 | 954 | ||
967 | //+by amy 080515 for dynamic mechenism | 955 | //+by amy 080515 for dynamic mechenism |
968 | //Add by amy Tx Power Control for Near/Far Range 2008/05/15 | 956 | //Add by amy Tx Power Control for Near/Far Range 2008/05/15 |
969 | bool bdynamic_txpower; //bDynamicTxPower | ||
970 | bool bDynamicTxHighPower; // Tx high power state | 957 | bool bDynamicTxHighPower; // Tx high power state |
971 | bool bDynamicTxLowPower; // Tx low power state | 958 | bool bDynamicTxLowPower; // Tx low power state |
972 | bool bLastDTPFlag_High; | 959 | bool bLastDTPFlag_High; |
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index 721e81a35bc..6ac556ce783 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c | |||
@@ -1901,7 +1901,6 @@ static void rtl8192_init_priv_variable(struct r8192_priv *priv) | |||
1901 | priv->txringcount = 64;//32; | 1901 | priv->txringcount = 64;//32; |
1902 | priv->rxbuffersize = 9100;//2048;//1024; | 1902 | priv->rxbuffersize = 9100;//2048;//1024; |
1903 | priv->rxringcount = MAX_RX_COUNT;//64; | 1903 | priv->rxringcount = MAX_RX_COUNT;//64; |
1904 | priv->rx_skb_complete = 1; | ||
1905 | priv->chan = 1; //set to channel 1 | 1904 | priv->chan = 1; //set to channel 1 |
1906 | priv->RegWirelessMode = WIRELESS_MODE_AUTO; | 1905 | priv->RegWirelessMode = WIRELESS_MODE_AUTO; |
1907 | priv->RegChannelPlan = 0xf; | 1906 | priv->RegChannelPlan = 0xf; |
@@ -2380,42 +2379,6 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv) | |||
2380 | if(priv->ChannelPlan > CHANNEL_PLAN_LEN - 1) | 2379 | if(priv->ChannelPlan > CHANNEL_PLAN_LEN - 1) |
2381 | priv->ChannelPlan = 0; //FCC | 2380 | priv->ChannelPlan = 0; //FCC |
2382 | 2381 | ||
2383 | switch(priv->CustomerID) | ||
2384 | { | ||
2385 | case RT_CID_DEFAULT: | ||
2386 | priv->LedStrategy = SW_LED_MODE1; | ||
2387 | break; | ||
2388 | |||
2389 | case RT_CID_819x_CAMEO: | ||
2390 | priv->LedStrategy = SW_LED_MODE2; | ||
2391 | break; | ||
2392 | |||
2393 | case RT_CID_819x_RUNTOP: | ||
2394 | priv->LedStrategy = SW_LED_MODE3; | ||
2395 | break; | ||
2396 | |||
2397 | case RT_CID_819x_Netcore: | ||
2398 | priv->LedStrategy = SW_LED_MODE4; | ||
2399 | break; | ||
2400 | |||
2401 | case RT_CID_Nettronix: | ||
2402 | priv->LedStrategy = SW_LED_MODE5; | ||
2403 | break; | ||
2404 | |||
2405 | case RT_CID_PRONET: | ||
2406 | priv->LedStrategy = SW_LED_MODE6; | ||
2407 | break; | ||
2408 | |||
2409 | case RT_CID_TOSHIBA: //Modify by Jacken 2008/01/31 | ||
2410 | // Do nothing. | ||
2411 | //break; | ||
2412 | |||
2413 | default: | ||
2414 | priv->LedStrategy = SW_LED_MODE1; | ||
2415 | break; | ||
2416 | } | ||
2417 | |||
2418 | |||
2419 | if( priv->eeprom_vid == 0x1186 && priv->eeprom_did == 0x3304) | 2382 | if( priv->eeprom_vid == 0x1186 && priv->eeprom_did == 0x3304) |
2420 | priv->ieee80211->bSupportRemoteWakeUp = true; | 2383 | priv->ieee80211->bSupportRemoteWakeUp = true; |
2421 | else | 2384 | else |
@@ -2424,10 +2387,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv) | |||
2424 | 2387 | ||
2425 | RT_TRACE(COMP_INIT, "RegChannelPlan(%d)\n", priv->RegChannelPlan); | 2388 | RT_TRACE(COMP_INIT, "RegChannelPlan(%d)\n", priv->RegChannelPlan); |
2426 | RT_TRACE(COMP_INIT, "ChannelPlan = %d\n", priv->ChannelPlan); | 2389 | RT_TRACE(COMP_INIT, "ChannelPlan = %d\n", priv->ChannelPlan); |
2427 | RT_TRACE(COMP_INIT, "LedStrategy = %d\n", priv->LedStrategy); | ||
2428 | RT_TRACE(COMP_TRACE, "<==== ReadAdapterInfo\n"); | 2390 | RT_TRACE(COMP_TRACE, "<==== ReadAdapterInfo\n"); |
2429 | |||
2430 | return ; | ||
2431 | } | 2391 | } |
2432 | 2392 | ||
2433 | 2393 | ||
diff --git a/drivers/staging/rtl8192e/r819xE_phy.c b/drivers/staging/rtl8192e/r819xE_phy.c index 1688997d346..f0975c61775 100644 --- a/drivers/staging/rtl8192e/r819xE_phy.c +++ b/drivers/staging/rtl8192e/r819xE_phy.c | |||
@@ -1451,8 +1451,6 @@ void rtl8192_phy_setTxPower(struct r8192_priv *priv, u8 channel) | |||
1451 | ant_pwr_diff = priv->TxPowerLevelOFDM24G_C[channel-1] | 1451 | ant_pwr_diff = priv->TxPowerLevelOFDM24G_C[channel-1] |
1452 | -priv->TxPowerLevelOFDM24G_A[channel-1]; | 1452 | -priv->TxPowerLevelOFDM24G_A[channel-1]; |
1453 | ant_pwr_diff &= 0xf; | 1453 | ant_pwr_diff &= 0xf; |
1454 | //DbgPrint(" ant_pwr_diff = 0x%x", (u8)(ant_pwr_diff)); | ||
1455 | priv->RF_C_TxPwDiff = ant_pwr_diff; | ||
1456 | 1454 | ||
1457 | priv->AntennaTxPwDiff[2] = 0;// RF-D, don't care | 1455 | priv->AntennaTxPwDiff[2] = 0;// RF-D, don't care |
1458 | priv->AntennaTxPwDiff[1] = (u8)(ant_pwr_diff);// RF-C | 1456 | priv->AntennaTxPwDiff[1] = (u8)(ant_pwr_diff);// RF-C |