Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into merge

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-tx.c

3 files changed, 35 insertions, 23 deletions

diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 192abfdc5039..9e2ae8f3ecb0 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -3186,14 +3186,27 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)
         int total_nr = 0;
         int i;
         struct pci_pool *pool;
-        u32 *virts[CB_NUMBER_OF_ELEMENTS_SMALL];
-        dma_addr_t phys[CB_NUMBER_OF_ELEMENTS_SMALL];
+        void **virts;
+        dma_addr_t *phys;
 
         IPW_DEBUG_TRACE("<< :\n");
 
+        virts = kmalloc(sizeof(void *) * CB_NUMBER_OF_ELEMENTS_SMALL,
+                        GFP_KERNEL);
+        if (!virts)
+                return -ENOMEM;
+
+        phys = kmalloc(sizeof(dma_addr_t) * CB_NUMBER_OF_ELEMENTS_SMALL,
+                        GFP_KERNEL);
+        if (!phys) {
+                kfree(virts);
+                return -ENOMEM;
+        }
         pool = pci_pool_create("ipw2200", priv->pci_dev, CB_MAX_LENGTH, 0, 0);
         if (!pool) {
                 IPW_ERROR("pci_pool_create failed\n");
+                kfree(phys);
+                kfree(virts);
                 return -ENOMEM;
         }
 
@@ -3263,6 +3276,8 @@ static int ipw_load_firmware(struct ipw_priv *priv, u8 * data, size_t len)
                 pci_pool_free(pool, virts[i], phys[i]);
 
         pci_pool_destroy(pool);
+        kfree(phys);
+        kfree(virts);
 
         return ret;
 }
diff --git a/drivers/net/wireless/ipw2x00/libipw.h b/drivers/net/wireless/ipw2x00/libipw.h
index 9ac136b98bb3..284b0e4cb815 100644
--- a/drivers/net/wireless/ipw2x00/libipw.h
+++ b/drivers/net/wireless/ipw2x00/libipw.h
@@ -797,7 +797,7 @@ struct libipw_device {
         /* Probe / Beacon management */
         struct list_head network_free_list;
         struct list_head network_list;
-        struct libipw_network *networks;
+        struct libipw_network *networks[MAX_NETWORK_COUNT];
         int scans;
         int scan_age;
 
diff --git a/drivers/net/wireless/ipw2x00/libipw_module.c b/drivers/net/wireless/ipw2x00/libipw_module.c
index 5b8841159b7c..55965408ff3f 100644
--- a/drivers/net/wireless/ipw2x00/libipw_module.c
+++ b/drivers/net/wireless/ipw2x00/libipw_module.c
@@ -67,16 +67,17 @@ void *libipw_wiphy_privid = &libipw_wiphy_privid;
 
 static int libipw_networks_allocate(struct libipw_device *ieee)
 {
-        if (ieee->networks)
-                return 0;
-
-        ieee->networks =
-            kzalloc(MAX_NETWORK_COUNT * sizeof(struct libipw_network),
-                    GFP_KERNEL);
-        if (!ieee->networks) {
-                printk(KERN_WARNING "%s: Out of memory allocating beacons\n",
-                       ieee->dev->name);
-                return -ENOMEM;
+        int i, j;
+
+        for (i = 0; i < MAX_NETWORK_COUNT; i++) {
+                ieee->networks[i] = kzalloc(sizeof(struct libipw_network),
+                                            GFP_KERNEL);
+                if (!ieee->networks[i]) {
+                        LIBIPW_ERROR("Out of memory allocating beacons\n");
+                        for (j = 0; j < i; j++)
+                                kfree(ieee->networks[j]);
+                        return -ENOMEM;
+                }
         }
 
         return 0;
@@ -97,15 +98,11 @@ static inline void libipw_networks_free(struct libipw_device *ieee)
 {
         int i;
 
-        if (!ieee->networks)
-                return;
-
-        for (i = 0; i < MAX_NETWORK_COUNT; i++)
-                if (ieee->networks[i].ibss_dfs)
-                        kfree(ieee->networks[i].ibss_dfs);
-
-        kfree(ieee->networks);
-        ieee->networks = NULL;
+        for (i = 0; i < MAX_NETWORK_COUNT; i++) {
+                if (ieee->networks[i]->ibss_dfs)
+                        kfree(ieee->networks[i]->ibss_dfs);
+                kfree(ieee->networks[i]);
+        }
 }
 
 void libipw_networks_age(struct libipw_device *ieee,
@@ -130,7 +127,7 @@ static void libipw_networks_initialize(struct libipw_device *ieee)
         INIT_LIST_HEAD(&ieee->network_free_list);
         INIT_LIST_HEAD(&ieee->network_list);
         for (i = 0; i < MAX_NETWORK_COUNT; i++)
-                list_add_tail(&ieee->networks[i].list,
+                list_add_tail(&ieee->networks[i]->list,
                               &ieee->network_free_list);
 }