From: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
To: gregkh@linuxfoundation.org, dan.carpenter@oracle.com,
sudipm.mukherjee@gmail.com
Cc: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 06/23] staging: rtl8192e: Remove rtllib_stats structure
Date: Tue, 14 Jul 2015 22:04:09 +0200 [thread overview]
Message-ID: <1436904266-25297-7-git-send-email-mateusz.kulikowski@gmail.com> (raw)
In-Reply-To: <1436904266-25297-1-git-send-email-mateusz.kulikowski@gmail.com>
Two remaining fields of rtllib_stats are only incremented, but
never read.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
---
drivers/staging/rtl8192e/rtllib.h | 6 ------
drivers/staging/rtl8192e/rtllib_rx.c | 2 --
drivers/staging/rtl8192e/rtllib_tx.c | 1 -
3 files changed, 9 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index dc0653a..c44c868 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -690,11 +690,6 @@ struct rtllib_frag_entry {
u8 dst_addr[ETH_ALEN];
};
-struct rtllib_stats {
- unsigned int tx_discards;
- unsigned int rx_discards_undecryptable;
-};
-
struct rtllib_device;
#define SEC_ACTIVE_KEY (1<<4)
@@ -1532,7 +1527,6 @@ struct rtllib_device {
/* Bookkeeping structures */
struct net_device_stats stats;
- struct rtllib_stats ieee_stats;
struct rtllib_softmac_stats softmac_stats;
/* Probe / Beacon management */
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index da862c3..0698a0d 100644
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -317,7 +317,6 @@ rtllib_rx_frame_decrypt(struct rtllib_device *ieee, struct sk_buff *skb,
netdev_dbg(ieee->dev,
"Decryption failed ICV mismatch (key %d)\n",
skb->data[hdrlen + 3] >> 6);
- ieee->ieee_stats.rx_discards_undecryptable++;
return -1;
}
@@ -1077,7 +1076,6 @@ static int rtllib_rx_get_crypt(struct rtllib_device *ieee, struct sk_buff *skb,
netdev_dbg(ieee->dev,
"Decryption failed (not set) (SA= %pM)\n",
hdr->addr2);
- ieee->ieee_stats.rx_discards_undecryptable++;
return -1;
}
}
diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c
index e99ea5e..517500c 100644
--- a/drivers/staging/rtl8192e/rtllib_tx.c
+++ b/drivers/staging/rtl8192e/rtllib_tx.c
@@ -205,7 +205,6 @@ int rtllib_encrypt_fragment(struct rtllib_device *ieee, struct sk_buff *frag,
if (res < 0) {
netdev_info(ieee->dev, "%s: Encryption failed: len=%d.\n",
ieee->dev->name, frag->len);
- ieee->ieee_stats.tx_discards++;
return -1;
}
--
1.8.4.1
next prev parent reply other threads:[~2015-07-14 20:04 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-14 20:04 [PATCH v2 00/23] staging: rtl8192e: Various cleanups Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 01/23] staging: rtl8192e: Remove ToLegalChannel() Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 02/23] staging: rtl8192e: Remove unused defines Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 03/23] staging: rtl8192e: Remove undefs Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 04/23] staging: rtl8192e: Remove unused enums Mateusz Kulikowski
2015-07-15 6:34 ` Jakub Sitnicki
2015-07-15 7:05 ` Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 05/23] staging: rtl8192e: Remove unused fields from rtllib_stats Mateusz Kulikowski
2015-07-15 4:57 ` Sudip Mukherjee
2015-07-15 4:58 ` Sudip Mukherjee
2015-07-14 20:04 ` Mateusz Kulikowski [this message]
2015-07-14 20:04 ` [PATCH v2 07/23] staging: rtl8192e: Remove unused ether_header structure Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 08/23] staging: rtl8192e: Remove unused rtllib_device::freq_band Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 09/23] staging: rtl8192e: Remove DOT11D_GetMaxTxPwrInDbm() Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 10/23] staging: rtl8192e: Remove read|write_nic_io_(d)word|byte() Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 11/23] staging: rtl8192e: Remove DMESG macro Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 12/23] staging: rtl8192e: Remove rtl819x_process_cck_rxpathsel() Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 13/23] staging: rtl8192e: probe: Remove bdma64 check Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 14/23] staging: rtl8192e: Remove rtl8192_rx_cmd() Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 15/23] staging: rtl8192e: rtl_dm: Make functions static Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 16/23] staging: rtl8192e: rtllib_HTProc: " Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 17/23] staging: rtl8192e: Make phy_RF8256_Config_ParaFile() static Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 18/23] staging: rtl8192e: rtl_core: Make functions static Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 19/23] staging: rtl8192e: r8192e_phy: " Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 20/23] staging: rtl8192e: Make rtl8192_QueryIsShort() static Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 21/23] staging: rtl8192e: rtllib_tx: Make functions static Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 22/23] staging: rtl8192e: Make rtllib_rx_mgt() static Mateusz Kulikowski
2015-07-14 20:04 ` [PATCH v2 23/23] staging: rtl8192e: rtllib_softmac: Make functions static Mateusz Kulikowski
2015-07-16 9:58 ` [PATCH v2 00/23] staging: rtl8192e: Various cleanups Dan Carpenter
2015-07-17 19:52 ` Mateusz Kulikowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436904266-25297-7-git-send-email-mateusz.kulikowski@gmail.com \
--to=mateusz.kulikowski@gmail.com \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sudipm.mukherjee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®