All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ipw2x00: cleanup dead code
@ 2018-12-19  3:00 YueHaibing
  2018-12-20  6:50 ` Kalle Valo
  0 siblings, 1 reply; 2+ messages in thread
From: YueHaibing @ 2018-12-19  3:00 UTC (permalink / raw)
  To: davem, stas.yakovlev, kvalo
  Cc: linux-kernel, netdev, linux-wireless, YueHaibing

Fix smatch warning:

drivers/net/wireless/intel/ipw2x00/ipw2100.c:5606
 shim__set_security() warn: always true condition '(sec->active_key <= 3) => (0-3 <= 3)'
drivers/net/wireless/intel/ipw2x00/ipw2200.c:10725
 shim__set_security() warn: always true condition '(sec->active_key <= 3) => (0-3 <= 3)'

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 drivers/net/wireless/intel/ipw2x00/ipw2100.c | 8 ++------
 drivers/net/wireless/intel/ipw2x00/ipw2200.c | 7 ++-----
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
index 6e31687..52e5ed2 100644
--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
@@ -5603,12 +5603,8 @@ static void shim__set_security(struct net_device *dev,
 
 	if ((sec->flags & SEC_ACTIVE_KEY) &&
 	    priv->ieee->sec.active_key != sec->active_key) {
-		if (sec->active_key <= 3) {
-			priv->ieee->sec.active_key = sec->active_key;
-			priv->ieee->sec.flags |= SEC_ACTIVE_KEY;
-		} else
-			priv->ieee->sec.flags &= ~SEC_ACTIVE_KEY;
-
+		priv->ieee->sec.active_key = sec->active_key;
+		priv->ieee->sec.flags |= SEC_ACTIVE_KEY;
 		priv->status |= STATUS_SECURITY_UPDATED;
 	}
 
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
index bbdca13..fa400f9 100644
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -10722,11 +10722,8 @@ static void shim__set_security(struct net_device *dev,
 	}
 
 	if (sec->flags & SEC_ACTIVE_KEY) {
-		if (sec->active_key <= 3) {
-			priv->ieee->sec.active_key = sec->active_key;
-			priv->ieee->sec.flags |= SEC_ACTIVE_KEY;
-		} else
-			priv->ieee->sec.flags &= ~SEC_ACTIVE_KEY;
+		priv->ieee->sec.active_key = sec->active_key;
+		priv->ieee->sec.flags |= SEC_ACTIVE_KEY;
 		priv->status |= STATUS_SECURITY_UPDATED;
 	} else
 		priv->ieee->sec.flags &= ~SEC_ACTIVE_KEY;
-- 
2.7.0



^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [PATCH] ipw2x00: cleanup dead code
  2018-12-19  3:00 [PATCH] ipw2x00: cleanup dead code YueHaibing
@ 2018-12-20  6:50 ` Kalle Valo
  0 siblings, 0 replies; 2+ messages in thread
From: Kalle Valo @ 2018-12-20  6:50 UTC (permalink / raw)
  To: YueHaibing
  Cc: davem, stas.yakovlev, linux-kernel, netdev, linux-wireless, YueHaibing

YueHaibing <yuehaibing@huawei.com> wrote:

> Fix smatch warning:
> 
> drivers/net/wireless/intel/ipw2x00/ipw2100.c:5606
>  shim__set_security() warn: always true condition '(sec->active_key <= 3) => (0-3 <= 3)'
> drivers/net/wireless/intel/ipw2x00/ipw2200.c:10725
>  shim__set_security() warn: always true condition '(sec->active_key <= 3) => (0-3 <= 3)'
> 
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>

Patch applied to wireless-drivers-next.git, thanks.

90a8c74a8d7b ipw2x00: cleanup dead code

-- 
https://patchwork.kernel.org/patch/10736741/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-12-20  6:50 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-19  3:00 [PATCH] ipw2x00: cleanup dead code YueHaibing
2018-12-20  6:50 ` Kalle Valo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.