aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorMateusz Kulikowski <mateusz.kulikowski@gmail.com>2015-03-31 18:24:38 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-03 09:29:31 -0400
commit8852112e1c23a27e41f1b6b401c254c2de0f82b5 (patch)
tree28085ab53d40fb443274e36521b85bdea866dd7e /drivers/staging
parent14b40d92881533dca8b25647f105b9546433cda2 (diff)
staging: rtl8192e: Remove dead code
Remove commented-out code Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c3
-rw-r--r--drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h7
-rw-r--r--drivers/staging/rtl8192e/rtllib_crypt_ccmp.c5
-rw-r--r--drivers/staging/rtl8192e/rtllib_rx.c7
-rw-r--r--drivers/staging/rtl8192e/rtllib_wx.c2
5 files changed, 2 insertions, 22 deletions
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index cb74e55b20d2..2869602436ef 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -2195,8 +2195,7 @@ rtl8192_InitializeVariables(struct net_device *dev)
2195 2195
2196 priv->rtllib->softmac_features = IEEE_SOFTMAC_SCAN | 2196 priv->rtllib->softmac_features = IEEE_SOFTMAC_SCAN |
2197 IEEE_SOFTMAC_ASSOCIATE | IEEE_SOFTMAC_PROBERQ | 2197 IEEE_SOFTMAC_ASSOCIATE | IEEE_SOFTMAC_PROBERQ |
2198 IEEE_SOFTMAC_PROBERS | IEEE_SOFTMAC_TX_QUEUE /* | 2198 IEEE_SOFTMAC_PROBERS | IEEE_SOFTMAC_TX_QUEUE;
2199 IEEE_SOFTMAC_BEACONS*/;
2200 2199
2201 priv->rtllib->tx_headroom = sizeof(struct tx_fwinfo_8190pci); 2200 priv->rtllib->tx_headroom = sizeof(struct tx_fwinfo_8190pci);
2202 2201
diff --git a/drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h b/drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h
index 970298b07af7..03eee3d059c6 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h
@@ -888,13 +888,6 @@
888#define bOFDMPHY0_End 0xcff 888#define bOFDMPHY0_End 0xcff
889#define bOFDMPHY1_End 0xdff 889#define bOFDMPHY1_End 0xdff
890 890
891/*#define max debug item in each debug page
892#define bMaxItem_FPGA_PHY0 0x9
893#define bMaxItem_FPGA_PHY1 0x3
894#define bMaxItem_PHY_11B 0x16
895#define bMaxItem_OFDM_PHY0 0x29
896#define bMaxItem_OFDM_PHY1 0x0 */
897
898#define bPMACControl 0x0 891#define bPMACControl 0x0
899#define bWMACControl 0x1 892#define bWMACControl 0x1
900#define bWNICControl 0x2 893#define bWNICControl 0x2
diff --git a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
index 505d466a6a8d..7d486e8887f8 100644
--- a/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
+++ b/drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
@@ -120,10 +120,7 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
120 fc = le16_to_cpu(hdr->frame_ctl); 120 fc = le16_to_cpu(hdr->frame_ctl);
121 a4_included = ((fc & (RTLLIB_FCTL_TODS | RTLLIB_FCTL_FROMDS)) == 121 a4_included = ((fc & (RTLLIB_FCTL_TODS | RTLLIB_FCTL_FROMDS)) ==
122 (RTLLIB_FCTL_TODS | RTLLIB_FCTL_FROMDS)); 122 (RTLLIB_FCTL_TODS | RTLLIB_FCTL_FROMDS));
123 /* 123
124 qc_included = ((WLAN_FC_GET_TYPE(fc) == RTLLIB_FTYPE_DATA) &&
125 (WLAN_FC_GET_STYPE(fc) & 0x08));
126 */
127 qc_included = ((WLAN_FC_GET_TYPE(fc) == RTLLIB_FTYPE_DATA) && 124 qc_included = ((WLAN_FC_GET_TYPE(fc) == RTLLIB_FTYPE_DATA) &&
128 (WLAN_FC_GET_STYPE(fc) & 0x80)); 125 (WLAN_FC_GET_STYPE(fc) & 0x80));
129 aad_len = 22; 126 aad_len = 22;
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index c1418b457a45..fe3e7e1273ff 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -2208,13 +2208,6 @@ static inline int rtllib_network_init(
2208 struct rtllib_network *network, 2208 struct rtllib_network *network,
2209 struct rtllib_rx_stats *stats) 2209 struct rtllib_rx_stats *stats)
2210{ 2210{
2211
2212 /*
2213 network->qos_data.active = 0;
2214 network->qos_data.supported = 0;
2215 network->qos_data.param_count = 0;
2216 network->qos_data.old_param_count = 0;
2217 */
2218 memset(&network->qos_data, 0, sizeof(struct rtllib_qos_data)); 2211 memset(&network->qos_data, 0, sizeof(struct rtllib_qos_data));
2219 2212
2220 /* Pull out fixed field data */ 2213 /* Pull out fixed field data */
diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index 64709decb57e..6234aae5b069 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -113,8 +113,6 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
113 113
114 /* Add frequency/channel */ 114 /* Add frequency/channel */
115 iwe.cmd = SIOCGIWFREQ; 115 iwe.cmd = SIOCGIWFREQ;
116/* iwe.u.freq.m = rtllib_frequency(network->channel, network->mode);
117 iwe.u.freq.e = 3; */
118 iwe.u.freq.m = network->channel; 116 iwe.u.freq.m = network->channel;
119 iwe.u.freq.e = 0; 117 iwe.u.freq.e = 0;
120 iwe.u.freq.i = 0; 118 iwe.u.freq.i = 0;