Commit 991d1cc5 authored by James Ketrenos's avatar James Ketrenos
Browse files

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: default avatarJames Ketrenos <jketreno@linux.intel.com>
parent e7582561

drivers/net/wireless/ipw2100.c

+2 −8
Original line number Diff line number Diff line
@@ -5866,11 +5866,8 @@ static int ipw2100_wpa_set_param(struct net_device *dev, u8 name, u32 value) 


	case IPW2100_PARAM_TKIP_COUNTERMEASURES:

		crypt = priv->ieee->crypt[priv->ieee->tx_keyidx];

		if (!crypt || !crypt->ops->set_flags || !crypt->ops->get_flags) {

			IPW_DEBUG_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);
@@ -7935,11 +7932,8 @@ static int ipw2100_wx_set_auth(struct net_device *dev, 


	case IW_AUTH_TKIP_COUNTERMEASURES:

		crypt = priv->ieee->crypt[priv->ieee->tx_keyidx];

		if (!crypt || !crypt->ops->set_flags || !crypt->ops->get_flags) {

			IPW_DEBUG_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);

drivers/net/wireless/ipw2200.c

+2 −8
Original line number Diff line number Diff line
@@ -6357,11 +6357,8 @@ static int ipw_wx_set_auth(struct net_device *dev, 


	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 @@ static int ipw_wx_get_auth(struct net_device *dev, 


	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;