tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

YueHaibing and committed by
Kalle Valo 90a8c74a 4f68ef64

+4 -11
+2 -6
drivers/net/wireless/intel/ipw2x00/ipw2100.c
··· 5603 5603 5604 5604 if ((sec->flags & SEC_ACTIVE_KEY) && 5605 5605 priv->ieee->sec.active_key != sec->active_key) { 5606 - if (sec->active_key <= 3) { 5607 - priv->ieee->sec.active_key = sec->active_key; 5608 - priv->ieee->sec.flags |= SEC_ACTIVE_KEY; 5609 - } else 5610 - priv->ieee->sec.flags &= ~SEC_ACTIVE_KEY; 5611 - 5606 + priv->ieee->sec.active_key = sec->active_key; 5607 + priv->ieee->sec.flags |= SEC_ACTIVE_KEY; 5612 5608 priv->status |= STATUS_SECURITY_UPDATED; 5613 5609 } 5614 5610
+2 -5
drivers/net/wireless/intel/ipw2x00/ipw2200.c
··· 10722 10722 } 10723 10723 10724 10724 if (sec->flags & SEC_ACTIVE_KEY) { 10725 - if (sec->active_key <= 3) { 10726 - priv->ieee->sec.active_key = sec->active_key; 10727 - priv->ieee->sec.flags |= SEC_ACTIVE_KEY; 10728 - } else 10729 - priv->ieee->sec.flags &= ~SEC_ACTIVE_KEY; 10725 + priv->ieee->sec.active_key = sec->active_key; 10726 + priv->ieee->sec.flags |= SEC_ACTIVE_KEY; 10730 10727 priv->status |= STATUS_SECURITY_UPDATED; 10731 10728 } else 10732 10729 priv->ieee->sec.flags &= ~SEC_ACTIVE_KEY;