1 files changed, 41 insertions, 33 deletions

diff --git a/drivers/net/wireless/wl12xx/wl1251.c b/drivers/net/wireless/wl12xx/wl1251.c
index ce1561a41fa4..1a352cf8c3ec 100644
--- a/drivers/net/wireless/wl12xx/wl1251.c
+++ b/drivers/net/wireless/wl12xx/wl1251.c
@@ -297,45 +297,48 @@ out:
 
 static int wl1251_mem_cfg(struct wl12xx *wl)
 {
-        struct wl1251_acx_config_memory mem_conf;
+        struct wl1251_acx_config_memory *mem_conf;
         int ret, i;
 
         wl12xx_debug(DEBUG_ACX, "wl1251 mem cfg");
 
+        mem_conf = kzalloc(sizeof(*mem_conf), GFP_KERNEL);
+        if (!mem_conf) {
+                ret = -ENOMEM;
+                goto out;
+        }
+
         /* memory config */
-        mem_conf.mem_config.num_stations = cpu_to_le16(DEFAULT_NUM_STATIONS);
-        mem_conf.mem_config.rx_mem_block_num = 35;
-        mem_conf.mem_config.tx_min_mem_block_num = 64;
-        mem_conf.mem_config.num_tx_queues = MAX_TX_QUEUES;
-        mem_conf.mem_config.host_if_options = HOSTIF_PKT_RING;
-        mem_conf.mem_config.num_ssid_profiles = 1;
-        mem_conf.mem_config.debug_buffer_size =
+        mem_conf->mem_config.num_stations = cpu_to_le16(DEFAULT_NUM_STATIONS);
+        mem_conf->mem_config.rx_mem_block_num = 35;
+        mem_conf->mem_config.tx_min_mem_block_num = 64;
+        mem_conf->mem_config.num_tx_queues = MAX_TX_QUEUES;
+        mem_conf->mem_config.host_if_options = HOSTIF_PKT_RING;
+        mem_conf->mem_config.num_ssid_profiles = 1;
+        mem_conf->mem_config.debug_buffer_size =
                 cpu_to_le16(TRACE_BUFFER_MAX_SIZE);
 
         /* RX queue config */
-        mem_conf.rx_queue_config.dma_address = 0;
-        mem_conf.rx_queue_config.num_descs = ACX_RX_DESC_DEF;
-        mem_conf.rx_queue_config.priority = DEFAULT_RXQ_PRIORITY;
-        mem_conf.rx_queue_config.type = DEFAULT_RXQ_TYPE;
+        mem_conf->rx_queue_config.dma_address = 0;
+        mem_conf->rx_queue_config.num_descs = ACX_RX_DESC_DEF;
+        mem_conf->rx_queue_config.priority = DEFAULT_RXQ_PRIORITY;
+        mem_conf->rx_queue_config.type = DEFAULT_RXQ_TYPE;
 
         /* TX queue config */
         for (i = 0; i < MAX_TX_QUEUES; i++) {
-                mem_conf.tx_queue_config[i].num_descs = ACX_TX_DESC_DEF;
-                mem_conf.tx_queue_config[i].attributes = i;
+                mem_conf->tx_queue_config[i].num_descs = ACX_TX_DESC_DEF;
+                mem_conf->tx_queue_config[i].attributes = i;
         }
 
-        mem_conf.header.id = ACX_MEM_CFG;
-        mem_conf.header.len = sizeof(struct wl1251_acx_config_memory) -
-                sizeof(struct acx_header);
-        mem_conf.header.len -=
-                (MAX_TX_QUEUE_CONFIGS - mem_conf.mem_config.num_tx_queues) *
-                sizeof(struct wl1251_acx_tx_queue_config);
-
-        ret = wl12xx_cmd_configure(wl, &mem_conf,
-                                   sizeof(struct wl1251_acx_config_memory));
-        if (ret < 0)
+        ret = wl12xx_cmd_configure(wl, ACX_MEM_CFG, mem_conf,
+                                   sizeof(*mem_conf));
+        if (ret < 0) {
                 wl12xx_warning("wl1251 mem config failed: %d", ret);
+                goto out;
+        }
 
+out:
+        kfree(mem_conf);
         return ret;
 }
 
@@ -529,28 +532,33 @@ static int wl1251_hw_init_txq_fill(u8 qid,
 
 static int wl1251_hw_init_tx_queue_config(struct wl12xx *wl)
 {
-        struct acx_tx_queue_qos_config config;
+        struct acx_tx_queue_qos_config *config;
         struct wl1251_acx_mem_map *wl_mem_map = wl->target_mem_map;
         int ret, i;
 
         wl12xx_debug(DEBUG_ACX, "acx tx queue config");
 
-        config.header.id = ACX_TX_QUEUE_CFG;
-        config.header.len = sizeof(struct acx_tx_queue_qos_config) -
-                sizeof(struct acx_header);
+        config = kzalloc(sizeof(*config), GFP_KERNEL);
+        if (!config) {
+                ret = -ENOMEM;
+                goto out;
+        }
 
         for (i = 0; i < MAX_NUM_OF_AC; i++) {
-                ret = wl1251_hw_init_txq_fill(i, &config,
+                ret = wl1251_hw_init_txq_fill(i, config,
                                               wl_mem_map->num_tx_mem_blocks);
                 if (ret < 0)
-                        return ret;
+                        goto out;
 
-                ret = wl12xx_cmd_configure(wl, &config, sizeof(config));
+                ret = wl12xx_cmd_configure(wl, ACX_TX_QUEUE_CFG,
+                                           config, sizeof(*config));
                 if (ret < 0)
-                        return ret;
+                        goto out;
         }
 
-        return 0;
+out:
+        kfree(config);
+        return ret;
 }
 
 static int wl1251_hw_init_data_path_config(struct wl12xx *wl)