From: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>,
dan.carpenter@oracle.com, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 23/33] staging: rtl8192e: Remove unimplemented iwpriv handlers
Date: Sat, 9 May 2015 23:19:11 +0200 [thread overview]
Message-ID: <1431206361-13736-24-git-send-email-mateusz.kulikowski@gmail.com> (raw)
In-Reply-To: <1431206361-13736-1-git-send-email-mateusz.kulikowski@gmail.com>
Remove the following private variables:
- force_mic_error - changes force_mic_error that is not used
- radio - changes sw_radio_on that is not used
- adhoc_peer_list - unimplemented
- firm_ver - unimplemented
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 -
drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 -
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 86 ++--------------------------
drivers/staging/rtl8192e/rtllib.h | 1 -
4 files changed, 4 insertions(+), 85 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index c7c03f3..5ef87ba 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1118,7 +1118,6 @@ static void rtl8192_init_priv_variable(struct net_device *dev)
priv->bDriverIsGoingToUnload = false;
priv->being_init_adapter = false;
priv->initialized_at_probe = false;
- priv->sw_radio_on = true;
priv->bdisable_nic = false;
priv->bfirst_init = false;
priv->txringcount = 64;
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
index 0640e76..6127e92 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h
@@ -626,7 +626,6 @@ struct r8192_priv {
u8 RegCWinMin;
u8 keepAliveLevel;
- bool sw_radio_on;
bool bHwRadioOff;
bool pwrdown;
bool blinked_ingpio;
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index 2ae2885..f1c066d 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -175,48 +175,6 @@ static int r8192_wx_force_reset(struct net_device *dev,
}
-static int r8192_wx_force_mic_error(struct net_device *dev,
- struct iw_request_info *info,
- union iwreq_data *wrqu, char *extra)
-{
- struct r8192_priv *priv = rtllib_priv(dev);
- struct rtllib_device *ieee = priv->rtllib;
-
- down(&priv->wx_sem);
-
- RT_TRACE(COMP_DBG, "%s(): force mic error !\n", __func__);
- ieee->force_mic_error = true;
- up(&priv->wx_sem);
- return 0;
-
-}
-
-#define MAX_ADHOC_PEER_NUM 64
-struct adhoc_peer_entry {
- unsigned char MacAddr[ETH_ALEN] __aligned(2);
- unsigned char WirelessMode;
- unsigned char bCurTxBW40MHz;
-};
-struct adhoc_peers_info {
- struct adhoc_peer_entry Entry[MAX_ADHOC_PEER_NUM];
- unsigned char num;
-};
-
-static int r8192_wx_get_adhoc_peers(struct net_device *dev,
- struct iw_request_info *info,
- union iwreq_data *wrqu, char *extra)
-{
- return 0;
-}
-
-
-static int r8191se_wx_get_firm_version(struct net_device *dev,
- struct iw_request_info *info,
- struct iw_param *wrqu, char *extra)
-{
- return 0;
-}
-
static int r8192_wx_adapter_power_status(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
@@ -247,28 +205,6 @@ static int r8192_wx_adapter_power_status(struct net_device *dev,
return 0;
}
-static int r8192se_wx_set_radio(struct net_device *dev,
- struct iw_request_info *info,
- union iwreq_data *wrqu, char *extra)
-{
- struct r8192_priv *priv = rtllib_priv(dev);
-
- down(&priv->wx_sem);
-
- netdev_info(dev, "%s(): set radio ! extra is %d\n", __func__, *extra);
- if ((*extra != 0) && (*extra != 1)) {
- RT_TRACE(COMP_ERR,
- "%s(): set radio an err value,must 0(radio off) or 1(radio on)\n",
- __func__);
- up(&priv->wx_sem);
- return -1;
- }
- priv->sw_radio_on = *extra;
- up(&priv->wx_sem);
- return 0;
-
-}
-
static int r8192se_wx_set_lps_awake_interval(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
@@ -1241,21 +1177,10 @@ static const struct iw_priv_args r8192_private_args[] = {
SIOCIWFIRSTPRIV + 0x3,
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "forcereset"
}, {
- SIOCIWFIRSTPRIV + 0x4,
- IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "force_mic_error"
- }, {
- SIOCIWFIRSTPRIV + 0x5,
- IW_PRIV_TYPE_NONE, IW_PRIV_TYPE_INT|IW_PRIV_SIZE_FIXED|1,
- "firm_ver"
- }, {
SIOCIWFIRSTPRIV + 0x6,
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED|1, IW_PRIV_TYPE_NONE,
"set_power"
}, {
- SIOCIWFIRSTPRIV + 0x9,
- IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED|1, IW_PRIV_TYPE_NONE,
- "radio"
- }, {
SIOCIWFIRSTPRIV + 0xa,
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED|1, IW_PRIV_TYPE_NONE,
"lps_interv"
@@ -1264,9 +1189,6 @@ static const struct iw_priv_args r8192_private_args[] = {
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED|1, IW_PRIV_TYPE_NONE,
"lps_force"
}, {
- SIOCIWFIRSTPRIV + 0xc,
- 0, IW_PRIV_TYPE_CHAR|2047, "adhoc_peer_list"
- }, {
SIOCIWFIRSTPRIV + 0x16,
IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 3, 0, "setpromisc"
}, {
@@ -1281,15 +1203,15 @@ static iw_handler r8192_private_handler[] = {
(iw_handler)r8192_wx_set_scan_type,
(iw_handler)r8192_wx_set_rawtx,
(iw_handler)r8192_wx_force_reset,
- (iw_handler)r8192_wx_force_mic_error,
- (iw_handler)r8191se_wx_get_firm_version,
+ (iw_handler)NULL,
+ (iw_handler)NULL,
(iw_handler)r8192_wx_adapter_power_status,
(iw_handler)NULL,
(iw_handler)NULL,
- (iw_handler)r8192se_wx_set_radio,
+ (iw_handler)NULL,
(iw_handler)r8192se_wx_set_lps_awake_interval,
(iw_handler)r8192se_wx_set_force_lps,
- (iw_handler)r8192_wx_get_adhoc_peers,
+ (iw_handler)NULL,
(iw_handler)NULL,
(iw_handler)NULL,
(iw_handler)NULL,
diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 8c614e0..d76ed90 100644
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1904,7 +1904,6 @@ struct rtllib_device {
u8 hwsec_active;
bool is_silent_reset;
- bool force_mic_error;
bool is_roaming;
bool ieee_up;
bool cannot_notify;
--
1.8.4.1
next prev parent reply other threads:[~2015-05-09 21:20 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-09 21:18 [PATCH v3 00/33] staging: rtl8192e: Fix more checkpatch.pl warnings Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 01/33] staging: rtl8192e: Declare ethernet addresses as __aligned(2) Mateusz Kulikowski
2015-05-09 22:29 ` Joe Perches
2015-05-12 19:44 ` Mateusz Kulikowski
2015-05-12 19:53 ` Joe Perches
2015-05-09 21:18 ` [PATCH v3 02/33] staging: rtl8192e: Fix PREFER_ETHER_ADDR_COPY warnings Mateusz Kulikowski
2015-05-10 13:19 ` Greg KH
2015-05-12 19:52 ` Mateusz Kulikowski
2015-05-12 21:19 ` Greg KH
2015-05-14 20:22 ` Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 03/33] staging: rtl8192e: Mark unaligned memcpy() Mateusz Kulikowski
2015-05-10 13:20 ` Greg KH
2015-05-12 20:05 ` Mateusz Kulikowski
2015-05-11 8:26 ` Dan Carpenter
2015-05-12 20:00 ` Mateusz Kulikowski
2015-05-13 8:22 ` Dan Carpenter
2015-05-14 20:29 ` Mateusz Kulikowski
2015-05-14 23:14 ` Dan Carpenter
2015-05-17 20:38 ` Mateusz Kulikowski
2015-05-18 9:09 ` Dan Carpenter
2015-05-09 21:18 ` [PATCH v3 04/33] staging: rtl8192e: Fix DEEP_INDENTATION warning in rtllib_parse_info_param() Mateusz Kulikowski
2015-05-10 7:49 ` Sudip Mukherjee
2015-05-12 21:01 ` Mateusz Kulikowski
2015-05-13 4:45 ` Sudip Mukherjee
2015-05-13 8:26 ` Dan Carpenter
2015-05-11 13:48 ` Dan Carpenter
2015-05-12 20:46 ` Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 05/33] staging: rtl8192e: Replace memcmp() with ether_addr_equal_unaligned() Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 06/33] staging: rtl8192e: Remove rtllib_crypt.[ch] Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 07/33] staging: rtl8192e: Replace RTLLIB_DEBUG(DL_ERR) with netdev_*() Mateusz Kulikowski
2015-05-10 7:53 ` Sudip Mukherjee
2015-05-12 20:43 ` Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 08/33] staging: rtl8192e: Remove RTLLIB_ERROR() and RTLLIB_WARNING() Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 09/33] staging: rtl8192e: Remove RTLLIB_DEBUG_WX() Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 10/33] staging: rtl8192e: Simplify rtllib_proces_probe_response() Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 11/33] staging: rtl8192e: Remove RTLLIB_DEBUG_SCAN() Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 12/33] staging: rtl8192e: Remove RTLLIB_DEBUG_(FRAG|EAP|DROP|STATE|TX|RX)() Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 13/33] staging: rtl8192e: Remove RTLLIB_DEBUG_QOS() Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 14/33] staging: rtl8192e: Remove RTLLIB_DEBUG_MGMT() Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 15/33] staging: rtl8192e: Remove RTLLIB_DEBUG_INFO() Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 16/33] staging: rtl8192e: Remove RTLLIB_DEBUG() Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 17/33] staging: rtl8192e: Remove RTLLIB_DEBUG_DATA() Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 18/33] staging: rtl8192e: Remove remains of RTLLIB_*_DEBUG() (including proc entry) Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 19/33] staging: rtl8192e: Remove assert() macro Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 20/33] staging: rtl8192e: Fix PREFER_PR_LEVEL warnings Mateusz Kulikowski
2015-05-09 22:37 ` Joe Perches
2015-05-12 20:20 ` Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 21/33] staging: rtl8192e: Fix LONG_LINE warnings Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 22/33] staging: rtl8192e: Fix LONG_LING in rtllib_parse_info_param() Mateusz Kulikowski
2015-05-09 21:19 ` Mateusz Kulikowski [this message]
2015-05-09 21:19 ` [PATCH v3 24/33] staging: rtl8192e: Fix OOM_MESSAGE warnings Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 25/33] staging: rtl8192e: Remove unused rtl_crypto.h Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 26/33] staging: rtl8192e: Replace ?: with max_t Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 27/33] staging: rtl8192e: Replace ?: with min_t Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 28/33] staging: rtl8192e: Replace ?: with max Mateusz Kulikowski
2015-05-11 13:22 ` Dan Carpenter
2015-05-12 20:08 ` Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 29/33] staging: rtl8192e: Remove unneeded RT_TRACE(COMP_ERR,...) Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 30/33] staging: rtl8192e: rtl8192_phy_checkBBAndRF(): Don't check MAC Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 31/33] staging: rtl8192e: Replace RT_TRACE(COMP_ERR, ...) with netdev_* Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 32/33] staging: rtl8192e: Fix trivial LONG_LINE errors Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 33/33] staging: rtl8192e: rtl8192E_suspend(): Fix WOL reporting 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=1431206361-13736-24-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 \
/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®