Commit ea9dc54e 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 85c876e4
...@@ -986,12 +986,10 @@ typedef struct r8192_priv ...@@ -986,12 +986,10 @@ typedef struct r8192_priv
short hw_plcp_len; short hw_plcp_len;
short plcp_preamble_mode; short plcp_preamble_mode;
u8 ScanDelay; u8 ScanDelay;
spinlock_t irq_lock;
spinlock_t irq_th_lock; spinlock_t irq_th_lock;
spinlock_t tx_lock; spinlock_t tx_lock;
spinlock_t rf_ps_lock; spinlock_t rf_ps_lock;
struct mutex mutex; struct mutex mutex;
spinlock_t rf_lock; //used to lock rf write operation added by wb
spinlock_t ps_lock; spinlock_t ps_lock;
u32 irq_mask; u32 irq_mask;
...@@ -1021,25 +1019,11 @@ typedef struct r8192_priv ...@@ -1021,25 +1019,11 @@ typedef struct r8192_priv
struct rtl8192_tx_ring tx_ring[MAX_TX_QUEUE_COUNT]; struct rtl8192_tx_ring tx_ring[MAX_TX_QUEUE_COUNT];
int txringcount; int txringcount;
//{ //{
int txbuffsize;
int txfwbuffersize;
//struct tx_pendingbuf txnp_pending; //struct tx_pendingbuf txnp_pending;
//struct tasklet_struct irq_tx_tasklet; //struct tasklet_struct irq_tx_tasklet;
struct tasklet_struct irq_rx_tasklet; struct tasklet_struct irq_rx_tasklet;
struct tasklet_struct irq_tx_tasklet; struct tasklet_struct irq_tx_tasklet;
struct tasklet_struct irq_prepare_beacon_tasklet; struct tasklet_struct irq_prepare_beacon_tasklet;
struct buffer *txmapbufs;
struct buffer *txbkpbufs;
struct buffer *txbepbufs;
struct buffer *txvipbufs;
struct buffer *txvopbufs;
struct buffer *txcmdbufs;
struct buffer *txmapbufstail;
struct buffer *txbkpbufstail;
struct buffer *txbepbufstail;
struct buffer *txvipbufstail;
struct buffer *txvopbufstail;
struct buffer *txcmdbufstail;
/* adhoc/master mode stuff */ /* adhoc/master mode stuff */
ptx_ring txbeaconringtail; ptx_ring txbeaconringtail;
dma_addr_t txbeaconringdma; dma_addr_t txbeaconringdma;
......
...@@ -2150,8 +2150,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev) ...@@ -2150,8 +2150,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
priv->bHwRadioOff = false; priv->bHwRadioOff = false;
priv->being_init_adapter = false; priv->being_init_adapter = false;
priv->txbuffsize = 1600;//1024;
priv->txfwbuffersize = 4096;
priv->txringcount = 64;//32; priv->txringcount = 64;//32;
//priv->txbeaconcount = priv->txringcount; //priv->txbeaconcount = priv->txringcount;
priv->txbeaconcount = 2; priv->txbeaconcount = 2;
...@@ -2301,11 +2299,9 @@ static void rtl8192_init_priv_variable(struct net_device* dev) ...@@ -2301,11 +2299,9 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
static void rtl8192_init_priv_lock(struct r8192_priv* priv) static void rtl8192_init_priv_lock(struct r8192_priv* priv)
{ {
spin_lock_init(&priv->tx_lock); spin_lock_init(&priv->tx_lock);
spin_lock_init(&priv->irq_lock);//added by thomas
spin_lock_init(&priv->irq_th_lock); spin_lock_init(&priv->irq_th_lock);
spin_lock_init(&priv->rf_ps_lock); spin_lock_init(&priv->rf_ps_lock);
spin_lock_init(&priv->ps_lock); spin_lock_init(&priv->ps_lock);
//spin_lock_init(&priv->rf_lock);
sema_init(&priv->wx_sem,1); sema_init(&priv->wx_sem,1);
sema_init(&priv->rf_sem,1); sema_init(&priv->rf_sem,1);
mutex_init(&priv->mutex); mutex_init(&priv->mutex);
......
...@@ -1727,7 +1727,6 @@ void rtl8192_phy_SetRFReg(struct net_device* dev, RF90_RADIO_PATH_E eRFPath, u32 ...@@ -1727,7 +1727,6 @@ void rtl8192_phy_SetRFReg(struct net_device* dev, RF90_RADIO_PATH_E eRFPath, u32
if(priv->ieee80211->eRFPowerState != eRfOn && !priv->being_init_adapter) if(priv->ieee80211->eRFPowerState != eRfOn && !priv->being_init_adapter)
return; return;
#endif #endif
//spin_lock_irqsave(&priv->rf_lock, flags);
//down(&priv->rf_sem); //down(&priv->rf_sem);
RT_TRACE(COMP_PHY, "FW RF CTRL is not ready now\n"); RT_TRACE(COMP_PHY, "FW RF CTRL is not ready now\n");
...@@ -1757,7 +1756,6 @@ void rtl8192_phy_SetRFReg(struct net_device* dev, RF90_RADIO_PATH_E eRFPath, u32 ...@@ -1757,7 +1756,6 @@ void rtl8192_phy_SetRFReg(struct net_device* dev, RF90_RADIO_PATH_E eRFPath, u32
}else }else
rtl8192_phy_RFSerialWrite(dev, eRFPath, RegAddr, Data); rtl8192_phy_RFSerialWrite(dev, eRFPath, RegAddr, Data);
} }
//spin_unlock_irqrestore(&priv->rf_lock, flags);
//up(&priv->rf_sem); //up(&priv->rf_sem);
} }
......
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