Thread (5 messages) 5 messages, 3 authors, 2015-11-29

Re: [PATCH] ath6kl: Use vmalloc for loading firmware using api1 method

From: Brent Taylor <hidden>
Date: 2015-11-28 18:58:33
Also in: linux-wireless, lkml

Sorry, the first e-mail was sent via gmail and I forgot about sending
it in plain text mode.

Whats the status on this patch?  I don't see it on patchwork anymore
nor is it in any of the git trees I checked.

Thanks,
Brent

On Fri, Oct 16, 2015 at 12:10 AM, Brent Taylor [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Signed-off-by: Brent Taylor <redacted>
---
 drivers/net/wireless/ath/ath6kl/init.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 6e473fa..2155739 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -673,10 +673,17 @@ static int ath6kl_get_fw(struct ath6kl *ar, const char *filename,
                return ret;

        *fw_len = fw_entry->size;
-       *fw = kmemdup(fw_entry->data, fw_entry->size, GFP_KERNEL);
-
-       if (*fw == NULL)
-               ret = -ENOMEM;
+       if (&ar->fw == fw) {
+               *fw = vmalloc(fw_entry->size);
+               if (*fw == NULL)
+                       ret = -ENOMEM;
+               else
+                       memcpy(*fw, fw_entry->data, fw_entry->size);
+       } else {
+               *fw = kmemdup(fw_entry->data, fw_entry->size, GFP_KERNEL);
+               if (*fw == NULL)
+                       ret = -ENOMEM;
+       }

        release_firmware(fw_entry);

--
2.6.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help