staging: rtl8192e: Remove unused rtllib_device members

Delete several members of rtllib_device including
their initializers if needed.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 71289ca91faeaca5dc68d4b0bc10a1781fcd921d..49110d32cf88f8f92edf9992a68b641b837cd181 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1059,8 +1059,6 @@ static void rtl8192_init_priv_handler(struct net_device *dev)
        priv->rtllib->UpdateBeaconInterruptHandler = NULL;
 
        priv->rtllib->ScanOperationBackupHandler = PHY_ScanOperationBackup8192;
-
-       priv->rtllib->rtllib_rfkill_poll = NULL;
 }
 
 static void rtl8192_init_priv_constant(struct net_device *dev)
@@ -1080,7 +1078,6 @@ static void rtl8192_init_priv_variable(struct net_device *dev)
 
        priv->AcmMethod = eAcmWay2_SW;
        priv->dot11CurrentPreambleMode = PREAMBLE_AUTO;
-       priv->rtllib->hwscan_sem_up = 1;
        priv->rtllib->status = 0;
        priv->polling_timer_on = 0;
        priv->up_first_time = 1;
@@ -1150,10 +1147,7 @@ static void rtl8192_init_priv_variable(struct net_device *dev)
        priv->rtllib->host_encrypt = 1;
        priv->rtllib->host_decrypt = 1;
 
-       priv->rtllib->dot11PowerSaveMode = eActive;
        priv->rtllib->fts = DEFAULT_FRAG_THRESHOLD;
-       priv->rtllib->MaxMssDensity = 0;
-       priv->rtllib->MinSpaceCfg = 0;
 
        priv->card_type = PCI;
 

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
index 8532e0c21e754e6830c956fa9232ef7cfa2a4091..1b21f3835446b8dfb3b7712888f1632c66525b8c 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -1812,7 +1812,6 @@ static void dm_init_ctstoself(struct net_device *dev)
        struct r8192_priv *priv = rtllib_priv((struct net_device *)dev);
 
        priv->rtllib->bCTSToSelfEnable = true;
-       priv->rtllib->CTSToSelfTH = CTSToSelfTHVal;
 }
 
 static void dm_ctstoself(struct net_device *dev)

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 49f31ec2646b6a7043f5a2bdf96fbae58b35888f..f3a4bbc35f8048254c68759d28b9254740ed162a 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1538,8 +1538,6 @@ struct rtllib_device {
        bool disable_mgnt_queue;
 
        unsigned long status;
-       short hwscan_ch_bk;
-       u8 hwscan_sem_up;
        u8      CntAfterLink;
 
        enum rt_op_mode OpMode;
@@ -1557,7 +1555,6 @@ struct rtllib_device {
        bool ieee_up;
        bool cannot_notify;
        bool bSupportRemoteWakeUp;
-       enum rt_ps_mode dot11PowerSaveMode;
        bool actscanning;
        bool FirstIe_InScan;
        bool be_scan_inprogress;
@@ -1567,7 +1564,6 @@ struct rtllib_device {
        bool is_set_key;
        bool wx_set_enc;
        struct rt_hi_throughput *pHTInfo;
-       spinlock_t bw_spinlock;
 
        spinlock_t reorder_spinlock;
        u8      Regdot11HTOperationalRateSet[16];
@@ -1576,12 +1572,9 @@ struct rtllib_device {
        u8      RegHTSuppRateSet[16];
        u8      HTCurrentOperaRate;
        u8      HTHighestOperaRate;
-       u8      MinSpaceCfg;
-       u8      MaxMssDensity;
        u8      bTxDisableRateFallBack;
        u8      bTxUseDriverAssingedRate;
        u8      bTxEnableFwCalcDur;
-       atomic_t        atm_chnlop;
        atomic_t        atm_swbw;
 
        struct list_head                Tx_TS_Admit_List;
@@ -1634,7 +1627,6 @@ struct rtllib_device {
        int ieee802_1x; /* is IEEE 802.1X used */
 
        /* WPA data */
-       bool bHalfNMode;
        bool bHalfWirelessN24GMode;
        int wpa_enabled;
        int drop_unencrypted;
@@ -1766,14 +1758,11 @@ struct rtllib_device {
        u8 AsocRetryCount;
        struct sk_buff_head skb_waitQ[MAX_QUEUE_SIZE];
        struct sk_buff_head  skb_aggQ[MAX_QUEUE_SIZE];
-       u32     sta_edca_param[4];
        bool aggregation;
-       bool enable_rx_imm_BA;
 
        bool    bdynamic_txpower_enable;
 
        bool bCTSToSelfEnable;
-       u8      CTSToSelfTH;
 
        u32     fsync_time_interval;
        u32     fsync_rate_bitmap;
@@ -1929,7 +1918,6 @@ struct rtllib_device {
        void (*rtllib_ips_leave_wq)(struct net_device *dev);
        void (*rtllib_ips_leave)(struct net_device *dev);
        void (*LeisurePSLeave)(struct net_device *dev);
-       void (*rtllib_rfkill_poll)(struct net_device *dev);
 
        /* This must be the last item so that it points to the data
         * allocated beyond this structure by alloc_rtllib

diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c
index 845d9b8a4aa2e54ea871fbd262c04637ec84c2a1..578b41bbd98a8cd72398130d84651630613c05e5 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_module.c
+++ b/drivers/staging/rtl8192e/rtllib_module.c
@@ -136,15 +136,12 @@ struct net_device *alloc_rtllib(int sizeof_priv)
 
        spin_lock_init(&ieee->lock);
        spin_lock_init(&ieee->wpax_suitlist_lock);
-       spin_lock_init(&ieee->bw_spinlock);
        spin_lock_init(&ieee->reorder_spinlock);
-       atomic_set(&(ieee->atm_chnlop), 0);
        atomic_set(&(ieee->atm_swbw), 0);
 
        /* SAM FIXME */
        lib80211_crypt_info_init(&ieee->crypt_info, "RTLLIB", &ieee->lock);
 
-       ieee->bHalfNMode = false;
        ieee->wpa_enabled = 0;
        ieee->tkip_countermeasures = 0;
        ieee->drop_unencrypted = 0;

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index dc3fc129f7e8872f110c30b9bfdd51efefd64320..6d1120547c1c013bd1e33570e62eaafbb803edce 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -1715,7 +1715,6 @@ inline void rtllib_softmac_new_net(struct rtllib_device *ieee,
                           !(ieee->softmac_features & IEEE_SOFTMAC_SCAN))
                                rtllib_stop_scan_syncro(ieee);
 
-                       ieee->hwscan_ch_bk = ieee->current_network.channel;
                        HTResetIOTSetting(ieee->pHTInfo);
                        ieee->wmm_acm = 0;
                        if (ieee->iw_mode == IW_MODE_INFRA) {
@@ -3022,12 +3021,7 @@ void rtllib_softmac_init(struct rtllib_device *ieee)
        ieee->is_set_key = false;
        init_mgmt_queue(ieee);
 
-       ieee->sta_edca_param[0] = 0x0000A403;
-       ieee->sta_edca_param[1] = 0x0000A427;
-       ieee->sta_edca_param[2] = 0x005E4342;
-       ieee->sta_edca_param[3] = 0x002F3262;
        ieee->aggregation = true;
-       ieee->enable_rx_imm_BA = true;
        ieee->tx_pending.txb = NULL;
 
        _setup_timer(&ieee->associate_timer,