ipw2x00: cleanup dead code

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>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
index 910db46db6a12ea2c74cf3b9e42a7a42ea9a7351..b58ef8dd1e47c1145d4fd255f46e7876a0088546 100644 (file)
--- 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 bbdca13c5a9f8540195f693b3c45819881041f1d..fa400f92d7e20f0f04d659afb8ac4df9df1efd73 100644 (file)
--- 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;