commit 991d1cc5963f4926478f3139ec0b0dd26a2c888c
author James Ketrenos <jketreno@linux.intel.com> Thu Oct 13 09:26:48 2005 +0000
committer James Ketrenos <jketreno@linux.intel.com> Mon Nov 07 17:52:02 2005 -0600
tree dcfb9b32f23be2c8952797fd81174219abd76c85
parent e758256104c3c2475f7746bc1b348c99cdb207f2

Removed warning about TKIP not being configured if countermeasures are
configured.

Countermeasures default to being turned off when wpa_supplicant runs,
regardless of if TKIP is being used.  They are only turned on if a TKIP
is running.  The warning we were printing is therefore not needed.

Signed-off-by: James Ketrenos <jketreno@linux.intel.com>

drivers/net/wireless/ipw2200.c

diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 8941929..750e43e9 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -6357,11 +6357,8 @@
 
 	case IW_AUTH_TKIP_COUNTERMEASURES:
 		crypt = priv->ieee->crypt[priv->ieee->tx_keyidx];
-		if (!crypt || !crypt->ops->set_flags || !crypt->ops->get_flags) {
-			IPW_WARNING("Can't set TKIP countermeasures: "
-				    "crypt not set!\n");
+		if (!crypt || !crypt->ops->set_flags || !crypt->ops->get_flags)
 			break;
-		}
 
 		flags = crypt->ops->get_flags(crypt->priv);
 
@@ -6453,11 +6450,8 @@
 
 	case IW_AUTH_TKIP_COUNTERMEASURES:
 		crypt = priv->ieee->crypt[priv->ieee->tx_keyidx];
-		if (!crypt || !crypt->ops->get_flags) {
-			IPW_WARNING("Can't get TKIP countermeasures: "
-				    "crypt not set!\n");
+		if (!crypt || !crypt->ops->get_flags)
 			break;
-		}
 
 		param->value = (crypt->ops->get_flags(crypt->priv) &
 				IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) ? 1 : 0;