2015-08-22 10:58:37

by Shraddha Barke

[permalink] [raw]
Subject: [PATCH 1/4] Staging: rtl8192e: rtl_core.c: Remove unused variable

This patch discards the variable ResetThreshold as it is not used
anywhere throughout the kernel.

Build tested it.

Signed-off-by: Shraddha Barke <[email protected]>
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 4 ----
1 file changed, 4 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index d6b46df..52e1e27 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1131,7 +1131,6 @@ static enum reset_type rtl819x_TxCheckStuck(struct net_device *dev)
{
struct r8192_priv *priv = rtllib_priv(dev);
u8 QueueID;
- u8 ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE;
bool bCheckFwTxCnt = false;
struct rtl8192_tx_ring *ring = NULL;
struct sk_buff *skb = NULL;
@@ -1140,13 +1139,10 @@ static enum reset_type rtl819x_TxCheckStuck(struct net_device *dev)

switch (priv->rtllib->ps) {
case RTLLIB_PS_DISABLED:
- ResetThreshold = NIC_SEND_HANG_THRESHOLD_NORMAL;
break;
case (RTLLIB_PS_MBCAST|RTLLIB_PS_UNICAST):
- ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE;
break;
default:
- ResetThreshold = NIC_SEND_HANG_THRESHOLD_POWERSAVE;
break;
}
spin_lock_irqsave(&priv->irq_th_lock, flags);
--
2.1.4



2015-08-22 10:58:50

by Shraddha Barke

[permalink] [raw]
Subject: [PATCH 4/4] Staging: rtl8723au: core: Remove unused variable

This patch discards the variable as it is not used anywhere throughout
the kernel.

Signed-off-by: Shraddha Barke <[email protected]>
---
drivers/staging/rtl8723au/core/rtw_security.c | 9 ---------
1 file changed, 9 deletions(-)

diff --git a/drivers/staging/rtl8723au/core/rtw_security.c b/drivers/staging/rtl8723au/core/rtw_security.c
index 3d40bab..82518cd 100644
--- a/drivers/staging/rtl8723au/core/rtw_security.c
+++ b/drivers/staging/rtl8723au/core/rtw_security.c
@@ -608,7 +608,6 @@ int rtw_tkip_encrypt23a(struct rtw_adapter *padapter,
u8 hw_hdr_offset = 0;
struct arc4context mycontext;
int curfragnum, length;
- u32 prwskeylen;
u8 *pframe, *payload, *iv, *prwskey;
union pn48 dot11txpn;
struct sta_info *stainfo;
@@ -655,8 +654,6 @@ int rtw_tkip_encrypt23a(struct rtw_adapter *padapter,
else
prwskey = &stainfo->dot118021x_UncstKey.skey[0];

- prwskeylen = 16;
-
/* 4 start to encrypt each fragment */
for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {
iv = pframe + pattrib->hdrlen;
@@ -719,7 +716,6 @@ int rtw_tkip_decrypt23a(struct rtw_adapter *padapter,
u32 actual_crc, expected_crc;
struct arc4context mycontext;
int length;
- u32 prwskeylen;
u8 *pframe, *payload, *iv, *prwskey;
union pn48 dot11txpn;
struct sta_info *stainfo;
@@ -749,12 +745,10 @@ int rtw_tkip_decrypt23a(struct rtw_adapter *padapter,
goto exit;
}
prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
- prwskeylen = 16;
} else {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_,
"%s: stainfo!= NULL!!!\n", __func__);
prwskey = &stainfo->dot118021x_UncstKey.skey[0];
- prwskeylen = 16;
}

iv = pframe + prxattrib->hdrlen;
@@ -1288,7 +1282,6 @@ int rtw_aes_encrypt23a(struct rtw_adapter *padapter,
{ /* exclude ICV */
/* Intermediate Buffers */
int curfragnum, length;
- u32 prwskeylen;
u8 *pframe, *prwskey;
u8 hw_hdr_offset = 0;
struct sta_info *stainfo;
@@ -1335,8 +1328,6 @@ int rtw_aes_encrypt23a(struct rtw_adapter *padapter,
else
prwskey = &stainfo->dot118021x_UncstKey.skey[0];

- prwskeylen = 16;
-
for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {
/* 4 the last fragment */
if ((curfragnum + 1) == pattrib->nr_frags) {
--
2.1.4


2015-08-22 10:58:46

by Shraddha Barke

[permalink] [raw]
Subject: [PATCH 3/4] Staging: rtl819u: ieee80211: Remove unused variable

This patch discards the variable count as it is not used anywhere
throughout the kernel.

Build tested it.

Signed-off-by: Shraddha Barke <[email protected]>
---
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
index 3e502520..3445fd4 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c
@@ -308,7 +308,6 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work)
HT_EXTCHNL_OFFSET chan_offset=0;
HT_CHANNEL_WIDTH bandwidth=0;
int b40M = 0;
- static int count;
chan = ieee->current_network.channel;
netif_carrier_off(ieee->dev);

@@ -357,7 +356,6 @@ void ieee80211_wx_sync_scan_wq(struct work_struct *work)
ieee80211_start_send_beacons(ieee);

netif_carrier_on(ieee->dev);
- count = 0;
up(&ieee->wx_sem);

}
--
2.1.4


2015-08-22 10:58:41

by Shraddha Barke

[permalink] [raw]
Subject: [PATCH 2/4] Staging: rtl8192e: r8192E_dev.c: Remove unused variable

This patch discards the variable as it is not used anywhere throughout
the kernel.

Build tested it.

Signed-off-by: Shraddha Barke <[email protected]>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index c28cabc..353e3fe 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -108,7 +108,6 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
case HW_VAR_MEDIA_STATUS:
{
enum rt_op_mode OpMode = *((enum rt_op_mode *)(val));
- enum led_ctl_mode LedAction = LED_CTL_NO_LINK;
u8 btMsr = rtl92e_readb(dev, MSR);

btMsr &= 0xfc;
@@ -116,7 +115,6 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)
switch (OpMode) {
case RT_OP_MODE_INFRASTRUCTURE:
btMsr |= MSR_INFRA;
- LedAction = LED_CTL_LINK;
break;

case RT_OP_MODE_IBSS:
@@ -125,7 +123,6 @@ void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val)

case RT_OP_MODE_AP:
btMsr |= MSR_AP;
- LedAction = LED_CTL_LINK;
break;

default:
--
2.1.4


2015-09-11 02:07:31

by Jes Sorensen

[permalink] [raw]
Subject: Re: [PATCH 4/4] Staging: rtl8723au: core: Remove unused variable

Shraddha Barke <[email protected]> writes:
> This patch discards the variable as it is not used anywhere throughout
> the kernel.
>
> Signed-off-by: Shraddha Barke <[email protected]>
> ---
> drivers/staging/rtl8723au/core/rtw_security.c | 9 ---------
> 1 file changed, 9 deletions(-)

Acked-by: Jes Sorensen <[email protected]>

>
> diff --git a/drivers/staging/rtl8723au/core/rtw_security.c b/drivers/staging/rtl8723au/core/rtw_security.c
> index 3d40bab..82518cd 100644
> --- a/drivers/staging/rtl8723au/core/rtw_security.c
> +++ b/drivers/staging/rtl8723au/core/rtw_security.c
> @@ -608,7 +608,6 @@ int rtw_tkip_encrypt23a(struct rtw_adapter *padapter,
> u8 hw_hdr_offset = 0;
> struct arc4context mycontext;
> int curfragnum, length;
> - u32 prwskeylen;
> u8 *pframe, *payload, *iv, *prwskey;
> union pn48 dot11txpn;
> struct sta_info *stainfo;
> @@ -655,8 +654,6 @@ int rtw_tkip_encrypt23a(struct rtw_adapter *padapter,
> else
> prwskey = &stainfo->dot118021x_UncstKey.skey[0];
>
> - prwskeylen = 16;
> -
> /* 4 start to encrypt each fragment */
> for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {
> iv = pframe + pattrib->hdrlen;
> @@ -719,7 +716,6 @@ int rtw_tkip_decrypt23a(struct rtw_adapter *padapter,
> u32 actual_crc, expected_crc;
> struct arc4context mycontext;
> int length;
> - u32 prwskeylen;
> u8 *pframe, *payload, *iv, *prwskey;
> union pn48 dot11txpn;
> struct sta_info *stainfo;
> @@ -749,12 +745,10 @@ int rtw_tkip_decrypt23a(struct rtw_adapter *padapter,
> goto exit;
> }
> prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
> - prwskeylen = 16;
> } else {
> RT_TRACE(_module_rtl871x_security_c_, _drv_err_,
> "%s: stainfo!= NULL!!!\n", __func__);
> prwskey = &stainfo->dot118021x_UncstKey.skey[0];
> - prwskeylen = 16;
> }
>
> iv = pframe + prxattrib->hdrlen;
> @@ -1288,7 +1282,6 @@ int rtw_aes_encrypt23a(struct rtw_adapter *padapter,
> { /* exclude ICV */
> /* Intermediate Buffers */
> int curfragnum, length;
> - u32 prwskeylen;
> u8 *pframe, *prwskey;
> u8 hw_hdr_offset = 0;
> struct sta_info *stainfo;
> @@ -1335,8 +1328,6 @@ int rtw_aes_encrypt23a(struct rtw_adapter *padapter,
> else
> prwskey = &stainfo->dot118021x_UncstKey.skey[0];
>
> - prwskeylen = 16;
> -
> for (curfragnum = 0; curfragnum < pattrib->nr_frags; curfragnum++) {
> /* 4 the last fragment */
> if ((curfragnum + 1) == pattrib->nr_frags) {