From 269b6263e6c36a1c24962a5f6a525d10789696e8 Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Thu, 13 Oct 2005 09:26:48 +0000 Subject: [PATCH] --- yaml --- r: 13595 b: refs/heads/master c: 991d1cc5963f4926478f3139ec0b0dd26a2c888c h: refs/heads/master i: 13593: 61af231d21fa43b0315d6658742d95665f9be86e 13591: 629a7a559d90ad52c5c55e3c21879da33acaff81 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ipw2100.c | 10 ++-------- trunk/drivers/net/wireless/ipw2200.c | 10 ++-------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index b2cfa2728e37..f1cdb2c93918 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e758256104c3c2475f7746bc1b348c99cdb207f2 +refs/heads/master: 991d1cc5963f4926478f3139ec0b0dd26a2c888c diff --git a/trunk/drivers/net/wireless/ipw2100.c b/trunk/drivers/net/wireless/ipw2100.c index ed4f1a5e6b0a..76841cb8301b 100644 --- a/trunk/drivers/net/wireless/ipw2100.c +++ b/trunk/drivers/net/wireless/ipw2100.c @@ -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); diff --git a/trunk/drivers/net/wireless/ipw2200.c b/trunk/drivers/net/wireless/ipw2200.c index 894192964c0b..750e43e9310a 100644 --- a/trunk/drivers/net/wireless/ipw2200.c +++ b/trunk/drivers/net/wireless/ipw2200.c @@ -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;