aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2200.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/ipw2200.c')
-rw-r--r--drivers/net/wireless/ipw2200.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 894192964c0b..750e43e9310a 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -6357,11 +6357,8 @@ static int ipw_wx_set_auth(struct net_device *dev,
6357 6357
6358 case IW_AUTH_TKIP_COUNTERMEASURES: 6358 case IW_AUTH_TKIP_COUNTERMEASURES:
6359 crypt = priv->ieee->crypt[priv->ieee->tx_keyidx]; 6359 crypt = priv->ieee->crypt[priv->ieee->tx_keyidx];
6360 if (!crypt || !crypt->ops->set_flags || !crypt->ops->get_flags) { 6360 if (!crypt || !crypt->ops->set_flags || !crypt->ops->get_flags)
6361 IPW_WARNING("Can't set TKIP countermeasures: "
6362 "crypt not set!\n");
6363 break; 6361 break;
6364 }
6365 6362
6366 flags = crypt->ops->get_flags(crypt->priv); 6363 flags = crypt->ops->get_flags(crypt->priv);
6367 6364
@@ -6453,11 +6450,8 @@ static int ipw_wx_get_auth(struct net_device *dev,
6453 6450
6454 case IW_AUTH_TKIP_COUNTERMEASURES: 6451 case IW_AUTH_TKIP_COUNTERMEASURES:
6455 crypt = priv->ieee->crypt[priv->ieee->tx_keyidx]; 6452 crypt = priv->ieee->crypt[priv->ieee->tx_keyidx];
6456 if (!crypt || !crypt->ops->get_flags) { 6453 if (!crypt || !crypt->ops->get_flags)
6457 IPW_WARNING("Can't get TKIP countermeasures: "
6458 "crypt not set!\n");
6459 break; 6454 break;
6460 }
6461 6455
6462 param->value = (crypt->ops->get_flags(crypt->priv) & 6456 param->value = (crypt->ops->get_flags(crypt->priv) &
6463 IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) ? 1 : 0; 6457 IEEE80211_CRYPTO_TKIP_COUNTERMEASURES) ? 1 : 0;