Commit 73fdfd7b authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman

staging: rtl8192e: Delete unused members from struct r8192_priv

Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 83969021
...@@ -801,7 +801,6 @@ typedef struct r8192_priv ...@@ -801,7 +801,6 @@ typedef struct r8192_priv
u8 eeprom_CustomerID; u8 eeprom_CustomerID;
u16 eeprom_ChannelPlan; u16 eeprom_ChannelPlan;
RT_CUSTOMER_ID CustomerID; RT_CUSTOMER_ID CustomerID;
LED_STRATEGY_8190 LedStrategy;
u8 IC_Cut; u8 IC_Cut;
int irq; int irq;
struct ieee80211_device *ieee80211; struct ieee80211_device *ieee80211;
...@@ -827,13 +826,6 @@ typedef struct r8192_priv ...@@ -827,13 +826,6 @@ typedef struct r8192_priv
int rxringcount; int rxringcount;
u16 rxbuffersize; u16 rxbuffersize;
struct sk_buff *rx_skb;
u32 *rxring;
u32 *rxringtail;
dma_addr_t rxringdma;
struct buffer *rxbuffer;
struct buffer *rxbufferhead;
short rx_skb_complete;
/* TX stuff */ /* TX stuff */
struct rtl8192_tx_ring tx_ring[MAX_TX_QUEUE_COUNT]; struct rtl8192_tx_ring tx_ring[MAX_TX_QUEUE_COUNT];
int txringcount; int txringcount;
...@@ -850,8 +842,6 @@ typedef struct r8192_priv ...@@ -850,8 +842,6 @@ typedef struct r8192_priv
short (*rf_set_sens)(struct net_device *dev,short sens); short (*rf_set_sens)(struct net_device *dev,short sens);
u8 (*rf_set_chan)(struct net_device *dev,u8 ch); u8 (*rf_set_chan)(struct net_device *dev,u8 ch);
void (*rf_close)(struct net_device *dev);
void (*rf_init)(struct net_device *dev);
short promisc; short promisc;
/* stats */ /* stats */
struct Stats stats; struct Stats stats;
...@@ -923,8 +913,6 @@ typedef struct r8192_priv ...@@ -923,8 +913,6 @@ typedef struct r8192_priv
u8 TxPowerLevelOFDM24G_A[14]; // RF-A, OFDM 2.4G channel 1~14 u8 TxPowerLevelOFDM24G_A[14]; // RF-A, OFDM 2.4G channel 1~14
u8 TxPowerLevelOFDM24G_C[14]; // RF-C, OFDM 2.4G channel 1~14 u8 TxPowerLevelOFDM24G_C[14]; // RF-C, OFDM 2.4G channel 1~14
u8 LegacyHTTxPowerDiff; // Legacy to HT rate power diff u8 LegacyHTTxPowerDiff; // Legacy to HT rate power diff
u8 TxPowerDiff;
char RF_C_TxPwDiff; // Antenna gain offset, rf-c to rf-a
u8 AntennaTxPwDiff[3]; // Antenna gain offset, index 0 for B, 1 for C, and 2 for D u8 AntennaTxPwDiff[3]; // Antenna gain offset, index 0 for B, 1 for C, and 2 for D
u8 CrystalCap; // CrystalCap. u8 CrystalCap; // CrystalCap.
u8 ThermalMeter[2]; // ThermalMeter, index 0 for RFIC0, and 1 for RFIC1 u8 ThermalMeter[2]; // ThermalMeter, index 0 for RFIC0, and 1 for RFIC1
...@@ -966,7 +954,6 @@ typedef struct r8192_priv ...@@ -966,7 +954,6 @@ typedef struct r8192_priv
//+by amy 080515 for dynamic mechenism //+by amy 080515 for dynamic mechenism
//Add by amy Tx Power Control for Near/Far Range 2008/05/15 //Add by amy Tx Power Control for Near/Far Range 2008/05/15
bool bdynamic_txpower; //bDynamicTxPower
bool bDynamicTxHighPower; // Tx high power state bool bDynamicTxHighPower; // Tx high power state
bool bDynamicTxLowPower; // Tx low power state bool bDynamicTxLowPower; // Tx low power state
bool bLastDTPFlag_High; bool bLastDTPFlag_High;
......
...@@ -1901,7 +1901,6 @@ static void rtl8192_init_priv_variable(struct r8192_priv *priv) ...@@ -1901,7 +1901,6 @@ static void rtl8192_init_priv_variable(struct r8192_priv *priv)
priv->txringcount = 64;//32; priv->txringcount = 64;//32;
priv->rxbuffersize = 9100;//2048;//1024; priv->rxbuffersize = 9100;//2048;//1024;
priv->rxringcount = MAX_RX_COUNT;//64; priv->rxringcount = MAX_RX_COUNT;//64;
priv->rx_skb_complete = 1;
priv->chan = 1; //set to channel 1 priv->chan = 1; //set to channel 1
priv->RegWirelessMode = WIRELESS_MODE_AUTO; priv->RegWirelessMode = WIRELESS_MODE_AUTO;
priv->RegChannelPlan = 0xf; priv->RegChannelPlan = 0xf;
...@@ -2380,42 +2379,6 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv) ...@@ -2380,42 +2379,6 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv)
if(priv->ChannelPlan > CHANNEL_PLAN_LEN - 1) if(priv->ChannelPlan > CHANNEL_PLAN_LEN - 1)
priv->ChannelPlan = 0; //FCC priv->ChannelPlan = 0; //FCC
switch(priv->CustomerID)
{
case RT_CID_DEFAULT:
priv->LedStrategy = SW_LED_MODE1;
break;
case RT_CID_819x_CAMEO:
priv->LedStrategy = SW_LED_MODE2;
break;
case RT_CID_819x_RUNTOP:
priv->LedStrategy = SW_LED_MODE3;
break;
case RT_CID_819x_Netcore:
priv->LedStrategy = SW_LED_MODE4;
break;
case RT_CID_Nettronix:
priv->LedStrategy = SW_LED_MODE5;
break;
case RT_CID_PRONET:
priv->LedStrategy = SW_LED_MODE6;
break;
case RT_CID_TOSHIBA: //Modify by Jacken 2008/01/31
// Do nothing.
//break;
default:
priv->LedStrategy = SW_LED_MODE1;
break;
}
if( priv->eeprom_vid == 0x1186 && priv->eeprom_did == 0x3304) if( priv->eeprom_vid == 0x1186 && priv->eeprom_did == 0x3304)
priv->ieee80211->bSupportRemoteWakeUp = true; priv->ieee80211->bSupportRemoteWakeUp = true;
else else
...@@ -2424,10 +2387,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv) ...@@ -2424,10 +2387,7 @@ static void rtl8192_read_eeprom_info(struct r8192_priv *priv)
RT_TRACE(COMP_INIT, "RegChannelPlan(%d)\n", priv->RegChannelPlan); RT_TRACE(COMP_INIT, "RegChannelPlan(%d)\n", priv->RegChannelPlan);
RT_TRACE(COMP_INIT, "ChannelPlan = %d\n", priv->ChannelPlan); RT_TRACE(COMP_INIT, "ChannelPlan = %d\n", priv->ChannelPlan);
RT_TRACE(COMP_INIT, "LedStrategy = %d\n", priv->LedStrategy);
RT_TRACE(COMP_TRACE, "<==== ReadAdapterInfo\n"); RT_TRACE(COMP_TRACE, "<==== ReadAdapterInfo\n");
return ;
} }
......
...@@ -1451,8 +1451,6 @@ void rtl8192_phy_setTxPower(struct r8192_priv *priv, u8 channel) ...@@ -1451,8 +1451,6 @@ void rtl8192_phy_setTxPower(struct r8192_priv *priv, u8 channel)
ant_pwr_diff = priv->TxPowerLevelOFDM24G_C[channel-1] ant_pwr_diff = priv->TxPowerLevelOFDM24G_C[channel-1]
-priv->TxPowerLevelOFDM24G_A[channel-1]; -priv->TxPowerLevelOFDM24G_A[channel-1];
ant_pwr_diff &= 0xf; ant_pwr_diff &= 0xf;
//DbgPrint(" ant_pwr_diff = 0x%x", (u8)(ant_pwr_diff));
priv->RF_C_TxPwDiff = ant_pwr_diff;
priv->AntennaTxPwDiff[2] = 0;// RF-D, don't care priv->AntennaTxPwDiff[2] = 0;// RF-D, don't care
priv->AntennaTxPwDiff[1] = (u8)(ant_pwr_diff);// RF-C priv->AntennaTxPwDiff[1] = (u8)(ant_pwr_diff);// RF-C
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment