Pulled out a stray KERNEL_VERSION check around the suspend handler.

[linux-2.6] / drivers / net / wireless / ipw2100.c

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index eaf47078ee564c7d1727c6674048ffbb26b30968..ed4f1a5e6b0a68e771edef986c1466931e8375d7 100644 (file)
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -167,7 +167,7 @@ that only one external action is invoked at a time.
 
 #include "ipw2100.h"
 
-#define IPW2100_VERSION "1.1.1"
+#define IPW2100_VERSION "1.1.3"
 
 #define DRV_NAME       "ipw2100"
 #define DRV_VERSION    IPW2100_VERSION
@@ -5443,8 +5443,11 @@ static void shim__set_security(struct net_device *dev,
                        else
                                memcpy(priv->ieee->sec.keys[i], sec->keys[i],
                                       sec->key_sizes[i]);
-                       priv->ieee->sec.flags |= (1 << i);
-                       priv->status |= STATUS_SECURITY_UPDATED;
+                       if (sec->level == SEC_LEVEL_1) {
+                               priv->ieee->sec.flags |= (1 << i);
+                               priv->status |= STATUS_SECURITY_UPDATED;
+                       } else
+                               priv->ieee->sec.flags &= ~(1 << i);
                }
        }
 
@@ -6430,11 +6433,8 @@ static struct net_device *ipw2100_alloc_device(struct pci_dev *pci_dev,
        INIT_LIST_HEAD(&priv->fw_pend_list);
        INIT_STAT(&priv->fw_pend_stat);
 
-#ifdef PF_SYNCTHREAD
-       priv->workqueue = create_workqueue(DRV_NAME, 0);
-#else
        priv->workqueue = create_workqueue(DRV_NAME);
-#endif
+
        INIT_WORK(&priv->reset_work,
                  (void (*)(void *))ipw2100_reset_adapter, priv);
        INIT_WORK(&priv->security_work,
@@ -6709,11 +6709,7 @@ static void __devexit ipw2100_pci_remove_one(struct pci_dev *pci_dev)
 }
 
 #ifdef CONFIG_PM
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
-static int ipw2100_suspend(struct pci_dev *pci_dev, u32 state)
-#else
 static int ipw2100_suspend(struct pci_dev *pci_dev, pm_message_t state)
-#endif
 {
        struct ipw2100_priv *priv = pci_get_drvdata(pci_dev);
        struct net_device *dev = priv->net_dev;