redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: rtl8192e: Remove unimplemented iwpriv handlers

Browse source 
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mateusz Kulikowski 2015-05-31 20:19:42 +02:00 committed by Greg Kroah-Hartman
parent 310852327a
commit 0beee3ba61
4 changed files with 4 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/rtl8192e/rtl8192e/rtl_core.c
View file

@ -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;

1
drivers/staging/rtl8192e/rtl8192e/rtl_core.h
View file

@ -626,7 +626,6 @@ struct r8192_priv {
u8 RegCWinMin;
u8 keepAliveLevel;
bool sw_radio_on;
bool bHwRadioOff;
bool pwrdown;
bool blinked_ingpio;

86
drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
View file

@ -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];
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)
@ -1239,21 +1175,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,
@ -1262,9 +1187,6 @@ static const struct iw_priv_args r8192_private_args[] = {
SIOCIWFIRSTPRIV + 0xb,
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"
@ -1280,15 +1202,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,

1
drivers/staging/rtl8192e/rtllib.h
View file

@ -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;