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

Staging: rtl8192e: Remove unused struct members

Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8875899c
...@@ -478,7 +478,7 @@ typedef struct Stats ...@@ -478,7 +478,7 @@ typedef struct Stats
{ {
unsigned long rxrdu; unsigned long rxrdu;
unsigned long rxok; unsigned long rxok;
unsigned long received_rate_histogram[4][32]; //0: Total, 1:OK, 2:CRC, 3:ICV, 2007 07 03 cosa unsigned long received_rate_histogram[4][32]; //0: Total, 1:OK, 2:CRC, 3:ICV
unsigned long rxoverflow; unsigned long rxoverflow;
unsigned long rxint; unsigned long rxint;
unsigned long txoverflow; unsigned long txoverflow;
...@@ -493,10 +493,8 @@ typedef struct Stats ...@@ -493,10 +493,8 @@ typedef struct Stats
unsigned long txfeedback; unsigned long txfeedback;
unsigned long txfeedbackok; unsigned long txfeedbackok;
unsigned long txoktotal; unsigned long txoktotal;
unsigned long txunicast;
unsigned long txbytesunicast; unsigned long txbytesunicast;
unsigned long rxbytesunicast; unsigned long rxbytesunicast;
unsigned long txerrbytestotal;
unsigned long slide_signal_strength[100]; unsigned long slide_signal_strength[100];
unsigned long slide_evm[100]; unsigned long slide_evm[100];
...@@ -505,8 +503,8 @@ typedef struct Stats ...@@ -505,8 +503,8 @@ typedef struct Stats
long signal_strength; // Transformed, in dbm. Beautified signal strength for UI, not correct. long signal_strength; // Transformed, in dbm. Beautified signal strength for UI, not correct.
u8 rx_rssi_percentage[4]; u8 rx_rssi_percentage[4];
u8 rx_evm_percentage[2]; u8 rx_evm_percentage[2];
u32 Slide_Beacon_pwdb[100]; //cosa add for beacon rssi u32 Slide_Beacon_pwdb[100];
u32 Slide_Beacon_Total; //cosa add for beacon rssi u32 Slide_Beacon_Total;
RT_SMOOTH_DATA_4RF cck_adc_pwdb; RT_SMOOTH_DATA_4RF cck_adc_pwdb;
} Stats; } Stats;
...@@ -974,8 +972,6 @@ typedef struct r8192_priv ...@@ -974,8 +972,6 @@ typedef struct r8192_priv
bool bLastDTPFlag_High; bool bLastDTPFlag_High;
bool bLastDTPFlag_Low; bool bLastDTPFlag_Low;
bool bstore_last_dtpflag;
bool bstart_txctrl_bydtp; //Define to discriminate on High power State or on sitesuvey to change Tx gain index
//Add by amy for Rate Adaptive //Add by amy for Rate Adaptive
rate_adaptive rate_adaptive; rate_adaptive rate_adaptive;
//Add by amy for TX power tracking //Add by amy for TX power tracking
...@@ -1008,7 +1004,6 @@ typedef struct r8192_priv ...@@ -1008,7 +1004,6 @@ typedef struct r8192_priv
bool bis_cur_rdlstate; bool bis_cur_rdlstate;
struct timer_list fsync_timer; struct timer_list fsync_timer;
bool bfsync_processing; // 500ms Fsync timer is active or not
u32 rate_record; u32 rate_record;
u32 rateCountDiffRecord; u32 rateCountDiffRecord;
u32 ContiuneDiffCount; u32 ContiuneDiffCount;
...@@ -1017,13 +1012,6 @@ typedef struct r8192_priv ...@@ -1017,13 +1012,6 @@ typedef struct r8192_priv
u8 framesync; u8 framesync;
u32 framesyncC34; u32 framesyncC34;
u8 framesyncMonitor; u8 framesyncMonitor;
//Added by amy 080516 for RX related
u16 nrxAMPDU_size;
u8 nrxAMPDU_aggr_num;
/*Last RxDesc TSF value*/
u32 last_rxdesc_tsf_high;
u32 last_rxdesc_tsf_low;
//by amy for gpio //by amy for gpio
bool bHwRadioOff; bool bHwRadioOff;
...@@ -1033,16 +1021,6 @@ typedef struct r8192_priv ...@@ -1033,16 +1021,6 @@ typedef struct r8192_priv
RT_OP_MODE OpMode; RT_OP_MODE OpMode;
//by amy for reset_count //by amy for reset_count
u32 reset_count; u32 reset_count;
bool bpbc_pressed;
//by amy for debug
u32 txpower_checkcnt;
u32 txpower_tracking_callback_cnt;
u8 thermal_read_val[40];
u8 thermal_readback_index;
u32 ccktxpower_adjustcnt_not_ch14;
u32 ccktxpower_adjustcnt_ch14;
u8 tx_fwinfo_force_subcarriermode;
u8 tx_fwinfo_force_subcarrierval;
//by amy for silent reset //by amy for silent reset
RESET_TYPE ResetProgress; RESET_TYPE ResetProgress;
......
...@@ -2092,10 +2092,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev) ...@@ -2092,10 +2092,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
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;
priv->nrxAMPDU_size = 0;
priv->nrxAMPDU_aggr_num = 0;
priv->last_rxdesc_tsf_high = 0;
priv->last_rxdesc_tsf_low = 0;
priv->ieee80211->mode = WIRELESS_MODE_AUTO; //SET AUTO priv->ieee80211->mode = WIRELESS_MODE_AUTO; //SET AUTO
priv->ieee80211->iw_mode = IW_MODE_INFRA; priv->ieee80211->iw_mode = IW_MODE_INFRA;
priv->ieee80211->ieee_up=0; priv->ieee80211->ieee_up=0;
...@@ -2106,7 +2102,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev) ...@@ -2106,7 +2102,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
priv->ieee80211->short_slot = 1; priv->ieee80211->short_slot = 1;
priv->promisc = (dev->flags & IFF_PROMISC) ? 1:0; priv->promisc = (dev->flags & IFF_PROMISC) ? 1:0;
priv->bcck_in_ch14 = false; priv->bcck_in_ch14 = false;
priv->bfsync_processing = false;
priv->CCKPresentAttentuation = 0; priv->CCKPresentAttentuation = 0;
priv->rfa_txpowertrackingindex = 0; priv->rfa_txpowertrackingindex = 0;
priv->rfc_txpowertrackingindex = 0; priv->rfc_txpowertrackingindex = 0;
...@@ -2123,12 +2118,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev) ...@@ -2123,12 +2118,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
priv->SetRFPowerStateInProgress = false; priv->SetRFPowerStateInProgress = false;
priv->ieee80211->PowerSaveControl.bInactivePs = true; priv->ieee80211->PowerSaveControl.bInactivePs = true;
priv->ieee80211->PowerSaveControl.bIPSModeBackup = false; priv->ieee80211->PowerSaveControl.bIPSModeBackup = false;
//just for debug
priv->txpower_checkcnt = 0;
priv->thermal_readback_index =0;
priv->txpower_tracking_callback_cnt = 0;
priv->ccktxpower_adjustcnt_ch14 = 0;
priv->ccktxpower_adjustcnt_not_ch14 = 0;
priv->ieee80211->current_network.beacon_interval = DEFAULT_BEACONINTERVAL; priv->ieee80211->current_network.beacon_interval = DEFAULT_BEACONINTERVAL;
priv->ieee80211->iw_mode = IW_MODE_INFRA; priv->ieee80211->iw_mode = IW_MODE_INFRA;
......
...@@ -1411,7 +1411,6 @@ void dm_backup_dynamic_mechanism_state(struct net_device *dev) ...@@ -1411,7 +1411,6 @@ void dm_backup_dynamic_mechanism_state(struct net_device *dev)
// Fsync to avoid reset // Fsync to avoid reset
priv->bswitch_fsync = false; priv->bswitch_fsync = false;
priv->bfsync_processing = false;
//Backup BB InitialGain //Backup BB InitialGain
dm_bb_initialgain_backup(dev); dm_bb_initialgain_backup(dev);
...@@ -2302,7 +2301,6 @@ static void dm_check_pbc_gpio(struct net_device *dev) ...@@ -2302,7 +2301,6 @@ static void dm_check_pbc_gpio(struct net_device *dev)
// Here we only set bPbcPressed to TRUE // Here we only set bPbcPressed to TRUE
// After trigger PBC, the variable will be set to FALSE // After trigger PBC, the variable will be set to FALSE
RT_TRACE(COMP_IO, "CheckPbcGPIO - PBC is pressed\n"); RT_TRACE(COMP_IO, "CheckPbcGPIO - PBC is pressed\n");
priv->bpbc_pressed = true;
} }
#endif #endif
......
...@@ -165,7 +165,6 @@ cmpk_count_txstatistic( ...@@ -165,7 +165,6 @@ cmpk_count_txstatistic(
/* We can not make sure broadcast/multicast or unicast mode. */ /* We can not make sure broadcast/multicast or unicast mode. */
if (pstx_fb->pkt_type != PACKET_MULTICAST && if (pstx_fb->pkt_type != PACKET_MULTICAST &&
pstx_fb->pkt_type != PACKET_BROADCAST) { pstx_fb->pkt_type != PACKET_BROADCAST) {
priv->stats.txunicast++;
priv->stats.txbytesunicast += pstx_fb->pkt_length; priv->stats.txbytesunicast += pstx_fb->pkt_length;
} }
} }
...@@ -366,8 +365,6 @@ static void cmpk_count_tx_status( struct net_device *dev, ...@@ -366,8 +365,6 @@ static void cmpk_count_tx_status( struct net_device *dev,
priv->stats.txfeedbackok += pstx_status->txok; priv->stats.txfeedbackok += pstx_status->txok;
priv->stats.txoktotal += pstx_status->txok; priv->stats.txoktotal += pstx_status->txok;
priv->stats.txunicast += pstx_status->txucok;
priv->stats.txbytesunicast += pstx_status->txuclength; priv->stats.txbytesunicast += pstx_status->txuclength;
} }
......
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