fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / net / wireless / prism54 / oid_mgt.c

diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c
index fa60a8f..e6cf9df 100644 (file)
--- a/drivers/net/wireless/prism54/oid_mgt.c
+++ b/drivers/net/wireless/prism54/oid_mgt.c
@@ -1,4 +1,4 @@
-/*   
+/*
  *  Copyright (C) 2003,2004 Aurelien Alleaume <slts@free.fr>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -24,8 +24,8 @@
 #include "isl_ioctl.h"
 
 /* to convert between channel and freq */
-const int frequency_list_bg[] = { 2412, 2417, 2422, 2427, 2432, 2437, 2442,
-       2447, 2452, 2457, 2462, 2467, 2472, 2484
+static const int frequency_list_bg[] = { 2412, 2417, 2422, 2427, 2432,
+       2437, 2442, 2447, 2452, 2457, 2462, 2467, 2472, 2484
 };
 
 int
@@ -235,12 +235,10 @@ mgt_init(islpci_private *priv)
 {
        int i;
 
-       priv->mib = kmalloc(OID_NUM_LAST * sizeof (void *), GFP_KERNEL);
+       priv->mib = kcalloc(OID_NUM_LAST, sizeof (void *), GFP_KERNEL);
        if (!priv->mib)
                return -ENOMEM;
 
-       memset(priv->mib, 0, OID_NUM_LAST * sizeof (void *));
-
        /* Alloc the cache */
        for (i = 0; i < OID_NUM_LAST; i++) {
                if (isl_oid[i].flags & OID_FLAG_CACHED) {
@@ -268,11 +266,10 @@ mgt_clean(islpci_private *priv)
 
        if (!priv->mib)
                return;
-       for (i = 0; i < OID_NUM_LAST; i++)
-               if (priv->mib[i]) {
-                       kfree(priv->mib[i]);
-                       priv->mib[i] = NULL;
-               }
+       for (i = 0; i < OID_NUM_LAST; i++) {
+               kfree(priv->mib[i]);
+               priv->mib[i] = NULL;
+       }
        kfree(priv->mib);
        priv->mib = NULL;
 }
@@ -333,7 +330,7 @@ mgt_le_to_cpu(int type, void *data)
        case OID_TYPE_ATTACH:{
                        struct obj_attachment *attach = data;
                        attach->id = le16_to_cpu(attach->id);
-                       attach->size = le16_to_cpu(attach->size);; 
+                       attach->size = le16_to_cpu(attach->size);
                        break;
        }
        case OID_TYPE_SSID:
@@ -402,7 +399,7 @@ mgt_cpu_to_le(int type, void *data)
        case OID_TYPE_ATTACH:{
                        struct obj_attachment *attach = data;
                        attach->id = cpu_to_le16(attach->id);
-                       attach->size = cpu_to_le16(attach->size);; 
+                       attach->size = cpu_to_le16(attach->size);
                        break;
        }
        case OID_TYPE_SSID:
@@ -504,7 +501,7 @@ mgt_set_varlen(islpci_private *priv, enum oid_num_t n, void *data, int extra_len
                }
                if (ret || response_op == PIMFOR_OP_ERROR)
                        ret = -EIO;
-       } else 
+       } else
                ret = -EIO;
 
        /* re-set given data to what it was */
@@ -728,8 +725,9 @@ mgt_commit(islpci_private *priv)
  * MEDIUMLIMIT,BEACONPERIOD,DTIMPERIOD,ATIMWINDOW,LISTENINTERVAL
  * FREQUENCY,EXTENDEDRATES.
  *
- * The way to do this is to set ESSID. Note though that they may get 
+ * The way to do this is to set ESSID. Note though that they may get
  * unlatch before though by setting another OID. */
+#if 0
 void
 mgt_unlatch_all(islpci_private *priv)
 {
@@ -756,6 +754,7 @@ mgt_unlatch_all(islpci_private *priv)
        if (rvalue)
                printk(KERN_DEBUG "%s: Unlatching OIDs failed\n", priv->ndev->name);
 }
+#endif
 
 /* This will tell you if you are allowed to answer a mlme(ex) request .*/