Skip to content

Commit

Permalink
staging: rtl8192e: Remove dead code
Browse files Browse the repository at this point in the history
Remove commented-out code

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Mateusz Kulikowski authored and Greg Kroah-Hartman committed Apr 3, 2015
1 parent 14b40d9 commit 8852112
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 22 deletions.
3 changes: 1 addition & 2 deletions drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -2195,8 +2195,7 @@ rtl8192_InitializeVariables(struct net_device *dev)

priv->rtllib->softmac_features = IEEE_SOFTMAC_SCAN |
IEEE_SOFTMAC_ASSOCIATE | IEEE_SOFTMAC_PROBERQ |
IEEE_SOFTMAC_PROBERS | IEEE_SOFTMAC_TX_QUEUE /* |
IEEE_SOFTMAC_BEACONS*/;
IEEE_SOFTMAC_PROBERS | IEEE_SOFTMAC_TX_QUEUE;

priv->rtllib->tx_headroom = sizeof(struct tx_fwinfo_8190pci);

Expand Down
7 changes: 0 additions & 7 deletions drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h
Original file line number Diff line number Diff line change
Expand Up @@ -888,13 +888,6 @@
#define bOFDMPHY0_End 0xcff
#define bOFDMPHY1_End 0xdff

/*#define max debug item in each debug page
#define bMaxItem_FPGA_PHY0 0x9
#define bMaxItem_FPGA_PHY1 0x3
#define bMaxItem_PHY_11B 0x16
#define bMaxItem_OFDM_PHY0 0x29
#define bMaxItem_OFDM_PHY1 0x0 */

#define bPMACControl 0x0
#define bWMACControl 0x1
#define bWNICControl 0x2
Expand Down
5 changes: 1 addition & 4 deletions drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,7 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
fc = le16_to_cpu(hdr->frame_ctl);
a4_included = ((fc & (RTLLIB_FCTL_TODS | RTLLIB_FCTL_FROMDS)) ==
(RTLLIB_FCTL_TODS | RTLLIB_FCTL_FROMDS));
/*
qc_included = ((WLAN_FC_GET_TYPE(fc) == RTLLIB_FTYPE_DATA) &&
(WLAN_FC_GET_STYPE(fc) & 0x08));
*/

qc_included = ((WLAN_FC_GET_TYPE(fc) == RTLLIB_FTYPE_DATA) &&
(WLAN_FC_GET_STYPE(fc) & 0x80));
aad_len = 22;
Expand Down
7 changes: 0 additions & 7 deletions drivers/staging/rtl8192e/rtllib_rx.c
Original file line number Diff line number Diff line change
Expand Up @@ -2208,13 +2208,6 @@ static inline int rtllib_network_init(
struct rtllib_network *network,
struct rtllib_rx_stats *stats)
{

/*
network->qos_data.active = 0;
network->qos_data.supported = 0;
network->qos_data.param_count = 0;
network->qos_data.old_param_count = 0;
*/
memset(&network->qos_data, 0, sizeof(struct rtllib_qos_data));

/* Pull out fixed field data */
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/rtl8192e/rtllib_wx.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,

/* Add frequency/channel */
iwe.cmd = SIOCGIWFREQ;
/* iwe.u.freq.m = rtllib_frequency(network->channel, network->mode);
iwe.u.freq.e = 3; */
iwe.u.freq.m = network->channel;
iwe.u.freq.e = 0;
iwe.u.freq.i = 0;
Expand Down

0 comments on commit 8852112

Please sign in to comment.