summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/hostap
diff options
context:
space:
mode:
authorMatt Renzelmann <mjr@cs.wisc.edu>2012-04-12 17:42:43 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-04-16 14:19:29 -0400
commit579b0637647de6e03e5707b32eb7c2ce56cc0f27 (patch)
tree1829b46eafd4727c09172026f18aa26fb8a761f9 /drivers/net/wireless/hostap
parentec14bcd20f5139a3dc42cfc34cdcebcbdc062c00 (diff)
hostap: GFP_ATOMIC/GFP_KERNEL cleanup
The driver is allocating memory during initialization with GFP_ATOMIC even though GFP_KERNEL is sufficient. This patch fixes it. Signed-off-by: Matt Renzelmann <mjr@cs.wisc.edu> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/hostap')
-rw-r--r--drivers/net/wireless/hostap/hostap_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index bfa0d54221e8..627bc12074c7 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -244,8 +244,7 @@ u16 hostap_tx_callback_register(local_info_t *local,
unsigned long flags;
struct hostap_tx_callback_info *entry;
- entry = kmalloc(sizeof(*entry),
- GFP_ATOMIC);
+ entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (entry == NULL)
return 0;