iwlwifi: reduce stack size
authorFrank Seidel <frank@f-seidel.de>
Sun, 1 Mar 2009 19:25:38 +0000 (20:25 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 5 Mar 2009 19:39:37 +0000 (14:39 -0500)
Reduce stack memory footprint of iwlwifi.
(From >1000 bytes for each *_table_read
on i386 down to 32)

Signed-off-by: Frank Seidel <frank@f-seidel.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-3945-rs.c
drivers/net/wireless/iwlwifi/iwl-agn-rs.c

index 7db8198c6253752d4b9313ece41b3e148af3c155..a2664589c884cc8a3340ad16eb92c171b42af0c8 100644 (file)
@@ -846,11 +846,16 @@ static ssize_t iwl3945_sta_dbgfs_stats_table_read(struct file *file,
                                                  char __user *user_buf,
                                                  size_t count, loff_t *ppos)
 {
-       char buff[1024];
+       char *buff;
        int desc = 0;
        int j;
+       ssize_t ret;
        struct iwl3945_rs_sta *lq_sta = file->private_data;
 
+       buff = kmalloc(1024, GFP_KERNEL);
+       if (!buff)
+               return -ENOMEM;
+
        desc += sprintf(buff + desc, "tx packets=%d last rate index=%d\n"
                        "rate=0x%X flush time %d\n",
                        lq_sta->tx_packets,
@@ -863,7 +868,9 @@ static ssize_t iwl3945_sta_dbgfs_stats_table_read(struct file *file,
                                lq_sta->win[j].success_counter,
                                lq_sta->win[j].success_ratio);
        }
-       return simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+       ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+       kfree(buff);
+       return ret;
 }
 
 static const struct file_operations rs_sta_dbgfs_stats_table_ops = {
index 04b42c8a77053d101c82d85a5b44dbfeb3fc973d..99da4067887882cb4d3ca99251217032246002e1 100644 (file)
@@ -2520,12 +2520,17 @@ static ssize_t rs_sta_dbgfs_scale_table_write(struct file *file,
 static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
                        char __user *user_buf, size_t count, loff_t *ppos)
 {
-       char buff[1024];
+       char *buff;
        int desc = 0;
        int i = 0;
+       ssize_t ret;
 
        struct iwl_lq_sta *lq_sta = file->private_data;
 
+       buff = kmalloc(1024, GFP_KERNEL);
+       if (!buff)
+               return -ENOMEM;
+
        desc += sprintf(buff+desc, "sta_id %d\n", lq_sta->lq.sta_id);
        desc += sprintf(buff+desc, "failed=%d success=%d rate=0%X\n",
                        lq_sta->total_failed, lq_sta->total_success,
@@ -2557,7 +2562,9 @@ static ssize_t rs_sta_dbgfs_scale_table_read(struct file *file,
                desc += sprintf(buff+desc, " rate[%d] 0x%X\n",
                        i, le32_to_cpu(lq_sta->lq.rs_table[i].rate_n_flags));
 
-       return simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+       ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+       kfree(buff);
+       return ret;
 }
 
 static const struct file_operations rs_sta_dbgfs_scale_table_ops = {
@@ -2568,11 +2575,17 @@ static const struct file_operations rs_sta_dbgfs_scale_table_ops = {
 static ssize_t rs_sta_dbgfs_stats_table_read(struct file *file,
                        char __user *user_buf, size_t count, loff_t *ppos)
 {
-       char buff[1024];
+       char *buff;
        int desc = 0;
        int i, j;
+       ssize_t ret;
 
        struct iwl_lq_sta *lq_sta = file->private_data;
+
+       buff = kmalloc(1024, GFP_KERNEL);
+       if (!buff)
+               return -ENOMEM;
+
        for (i = 0; i < LQ_SIZE; i++) {
                desc += sprintf(buff+desc, "%s type=%d SGI=%d FAT=%d DUP=%d\n"
                                "rate=0x%X\n",
@@ -2590,7 +2603,9 @@ static ssize_t rs_sta_dbgfs_stats_table_read(struct file *file,
                                lq_sta->lq_info[i].win[j].success_ratio);
                }
        }
-       return simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+       ret = simple_read_from_buffer(user_buf, count, ppos, buff, desc);
+       kfree(buff);
+       return ret;
 }
 
 static const struct file_operations rs_sta_dbgfs_stats_table_ops = {