* [PATCH -next] staging: rtl8192e: Remove set but not used variables 'broad_addr, stype'
@ 2019-02-18 12:33 YueHaibing
2019-02-18 14:31 ` Dan Carpenter
2019-02-18 15:15 ` [PATCH v2 " YueHaibing
0 siblings, 2 replies; 5+ messages in thread
From: YueHaibing @ 2019-02-18 12:33 UTC (permalink / raw)
To: Greg Kroah-Hartman, Himadri Pandya, David S. Miller,
Colin Ian King
Cc: YueHaibing, devel, linux-kernel, kernel-janitors
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/staging/rtl8192e/rtl8192e/rtl_core.c: In function '_rtl92e_tx':
drivers/staging/rtl8192e/rtl8192e/rtl_core.c:1732:28: warning:
variable 'broad_addr' set but not used [-Wunused-but-set-variable]
drivers/staging/rtl8192e/rtl8192e/rtl_core.c:1731:24: warning:
variable 'stype' set but not used [-Wunused-but-set-variable]
They're never used and can be removed.
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index c145b689175c..ddf3ee71a632 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1728,8 +1728,8 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb)
MAX_DEV_ADDR_SIZE);
struct tx_desc *pdesc = NULL;
struct rtllib_hdr_1addr *header = NULL;
- u16 fc = 0, type = 0, stype = 0;
- bool multi_addr = false, broad_addr = false, uni_addr = false;
+ u16 fc = 0, type = 0;
+ bool multi_addr = false, uni_addr = false;
u8 *pda_addr = NULL;
int idx;
u32 fwinfo_size = 0;
@@ -1747,11 +1747,10 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb)
header = (struct rtllib_hdr_1addr *)(((u8 *)skb->data) + fwinfo_size);
fc = le16_to_cpu(header->frame_ctl);
type = WLAN_FC_GET_TYPE(fc);
- stype = WLAN_FC_GET_STYPE(fc);
pda_addr = header->addr1;
if (is_broadcast_ether_addr(pda_addr))
- broad_addr = true;
+ ;
else if (is_multicast_ether_addr(pda_addr))
multi_addr = true;
else
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH -next] staging: rtl8192e: Remove set but not used variables 'broad_addr, stype'
2019-02-18 12:33 [PATCH -next] staging: rtl8192e: Remove set but not used variables 'broad_addr, stype' YueHaibing
@ 2019-02-18 14:31 ` Dan Carpenter
2019-02-18 14:48 ` YueHaibing
2019-02-18 15:15 ` [PATCH v2 " YueHaibing
1 sibling, 1 reply; 5+ messages in thread
From: Dan Carpenter @ 2019-02-18 14:31 UTC (permalink / raw)
To: YueHaibing
Cc: Greg Kroah-Hartman, Himadri Pandya, David S. Miller,
Colin Ian King, devel, kernel-janitors, linux-kernel
On Mon, Feb 18, 2019 at 12:33:59PM +0000, YueHaibing wrote:
> @@ -1747,11 +1747,10 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb)
> header = (struct rtllib_hdr_1addr *)(((u8 *)skb->data) + fwinfo_size);
> fc = le16_to_cpu(header->frame_ctl);
> type = WLAN_FC_GET_TYPE(fc);
> - stype = WLAN_FC_GET_STYPE(fc);
> pda_addr = header->addr1;
>
> if (is_broadcast_ether_addr(pda_addr))
> - broad_addr = true;
> + ;
> else if (is_multicast_ether_addr(pda_addr))
> multi_addr = true;
> else
>
This is ugly. Please do it like this:
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index c145b689175c..29b53e2246b4 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1729,7 +1729,6 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb)
struct tx_desc *pdesc = NULL;
struct rtllib_hdr_1addr *header = NULL;
u16 fc = 0, type = 0, stype = 0;
- bool multi_addr = false, broad_addr = false, uni_addr = false;
u8 *pda_addr = NULL;
int idx;
u32 fwinfo_size = 0;
@@ -1751,18 +1750,11 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb)
pda_addr = header->addr1;
if (is_broadcast_ether_addr(pda_addr))
- broad_addr = true;
+ priv->stats.txbytesbroadcast += skb->len - fwinfo_size;
else if (is_multicast_ether_addr(pda_addr))
- multi_addr = true;
- else
- uni_addr = true;
-
- if (uni_addr)
- priv->stats.txbytesunicast += skb->len - fwinfo_size;
- else if (multi_addr)
priv->stats.txbytesmulticast += skb->len - fwinfo_size;
else
- priv->stats.txbytesbroadcast += skb->len - fwinfo_size;
+ priv->stats.txbytesunicast += skb->len - fwinfo_size;
spin_lock_irqsave(&priv->irq_th_lock, flags);
ring = &priv->tx_ring[tcb_desc->queue_index];
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH -next] staging: rtl8192e: Remove set but not used variables 'broad_addr, stype'
2019-02-18 14:31 ` Dan Carpenter
@ 2019-02-18 14:48 ` YueHaibing
0 siblings, 0 replies; 5+ messages in thread
From: YueHaibing @ 2019-02-18 14:48 UTC (permalink / raw)
To: Dan Carpenter
Cc: Greg Kroah-Hartman, Himadri Pandya, David S. Miller,
Colin Ian King, devel, kernel-janitors, linux-kernel
On 2019/2/18 22:31, Dan Carpenter wrote:
> On Mon, Feb 18, 2019 at 12:33:59PM +0000, YueHaibing wrote:
>> @@ -1747,11 +1747,10 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb)
>> header = (struct rtllib_hdr_1addr *)(((u8 *)skb->data) + fwinfo_size);
>> fc = le16_to_cpu(header->frame_ctl);
>> type = WLAN_FC_GET_TYPE(fc);
>> - stype = WLAN_FC_GET_STYPE(fc);
>> pda_addr = header->addr1;
>>
>> if (is_broadcast_ether_addr(pda_addr))
>> - broad_addr = true;
>> + ;
>> else if (is_multicast_ether_addr(pda_addr))
>> multi_addr = true;
>> else
>>
>
> This is ugly. Please do it like this:
Thank you for correct me.
>
>
> diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
> index c145b689175c..29b53e2246b4 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
> @@ -1729,7 +1729,6 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb)
> struct tx_desc *pdesc = NULL;
> struct rtllib_hdr_1addr *header = NULL;
> u16 fc = 0, type = 0, stype = 0;
> - bool multi_addr = false, broad_addr = false, uni_addr = false;
> u8 *pda_addr = NULL;
> int idx;
> u32 fwinfo_size = 0;
> @@ -1751,18 +1750,11 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb)
> pda_addr = header->addr1;
>
> if (is_broadcast_ether_addr(pda_addr))
> - broad_addr = true;
> + priv->stats.txbytesbroadcast += skb->len - fwinfo_size;
> else if (is_multicast_ether_addr(pda_addr))
> - multi_addr = true;
> - else
> - uni_addr = true;
> -
> - if (uni_addr)
> - priv->stats.txbytesunicast += skb->len - fwinfo_size;
> - else if (multi_addr)
> priv->stats.txbytesmulticast += skb->len - fwinfo_size;
> else
> - priv->stats.txbytesbroadcast += skb->len - fwinfo_size;
> + priv->stats.txbytesunicast += skb->len - fwinfo_size;
>
> spin_lock_irqsave(&priv->irq_th_lock, flags);
> ring = &priv->tx_ring[tcb_desc->queue_index];
>
> .
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 -next] staging: rtl8192e: Remove set but not used variables 'broad_addr, stype'
2019-02-18 12:33 [PATCH -next] staging: rtl8192e: Remove set but not used variables 'broad_addr, stype' YueHaibing
2019-02-18 14:31 ` Dan Carpenter
@ 2019-02-18 15:15 ` YueHaibing
2019-02-18 15:05 ` Dan Carpenter
1 sibling, 1 reply; 5+ messages in thread
From: YueHaibing @ 2019-02-18 15:15 UTC (permalink / raw)
To: Greg Kroah-Hartman, Himadri Pandya, David S. Miller,
Colin Ian King
Cc: YueHaibing, devel, linux-kernel, kernel-janitors
Fixes gcc '-Wunused-but-set-variable' warning:
drivers/staging/rtl8192e/rtl8192e/rtl_core.c: In function '_rtl92e_tx':
drivers/staging/rtl8192e/rtl8192e/rtl_core.c:1732:28: warning:
variable 'broad_addr' set but not used [-Wunused-but-set-variable]
drivers/staging/rtl8192e/rtl8192e/rtl_core.c:1731:24: warning:
variable 'stype' set but not used [-Wunused-but-set-variable]
This remove unnessesary bool variable 'multi_addr, broad_addr, uni_addr'
Also 'stype' never used and can be removed.
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
v2: remove unnessesary bool variable 'multi_addr,uni_addr'
---
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index c145b689175c..253f1911a3f4 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -1728,8 +1728,7 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb)
MAX_DEV_ADDR_SIZE);
struct tx_desc *pdesc = NULL;
struct rtllib_hdr_1addr *header = NULL;
- u16 fc = 0, type = 0, stype = 0;
- bool multi_addr = false, broad_addr = false, uni_addr = false;
+ u16 fc = 0, type = 0;
u8 *pda_addr = NULL;
int idx;
u32 fwinfo_size = 0;
@@ -1747,22 +1746,14 @@ static short _rtl92e_tx(struct net_device *dev, struct sk_buff *skb)
header = (struct rtllib_hdr_1addr *)(((u8 *)skb->data) + fwinfo_size);
fc = le16_to_cpu(header->frame_ctl);
type = WLAN_FC_GET_TYPE(fc);
- stype = WLAN_FC_GET_STYPE(fc);
pda_addr = header->addr1;
if (is_broadcast_ether_addr(pda_addr))
- broad_addr = true;
+ priv->stats.txbytesbroadcast += skb->len - fwinfo_size;
else if (is_multicast_ether_addr(pda_addr))
- multi_addr = true;
- else
- uni_addr = true;
-
- if (uni_addr)
- priv->stats.txbytesunicast += skb->len - fwinfo_size;
- else if (multi_addr)
priv->stats.txbytesmulticast += skb->len - fwinfo_size;
else
- priv->stats.txbytesbroadcast += skb->len - fwinfo_size;
+ priv->stats.txbytesunicast += skb->len - fwinfo_size;
spin_lock_irqsave(&priv->irq_th_lock, flags);
ring = &priv->tx_ring[tcb_desc->queue_index];
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-02-18 15:06 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-18 12:33 [PATCH -next] staging: rtl8192e: Remove set but not used variables 'broad_addr, stype' YueHaibing
2019-02-18 14:31 ` Dan Carpenter
2019-02-18 14:48 ` YueHaibing
2019-02-18 15:15 ` [PATCH v2 " YueHaibing
2019-02-18 15:05 ` Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox