Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90a8c74a authored Dec 19, 2018 by YueHaibing Committed by Kalle Valo Dec 20, 2018

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>

parent 4f68ef64

drivers/net/wireless/intel/ipw2x00/ipw2100.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -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->status \|= STATUS_SECURITY_UPDATED;
		}

drivers/net/wireless/intel/ipw2x00/ipw2200.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -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->status \|= STATUS_SECURITY_UPDATED;
		} else
		priv->ieee->sec.flags &= ~SEC_ACTIVE_KEY;