aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00dev.c
diff options
context:
space:
mode:
authorHelmut Schaa <helmut.schaa@googlemail.com>2012-04-19 07:24:10 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-04-23 15:35:29 -0400
commit88211021a67250fd65029d7400f41ee8f91cb25d (patch)
tree7dcb1dd566c559dfe6a4d903bfbf47acc0249286 /drivers/net/wireless/rt2x00/rt2x00dev.c
parent0c0fdf6c80d4abd879e8bfaf48a20fd2b37e6c67 (diff)
rt2x00: Use GFP_KERNEL for rx buffer allocation on USB devices
Since the RX path on USB devices is handled in process context we can use GFP_KERNEL for RX buffer allocation. This should reduce the likelihood of allocation failures. Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> Tested-By: Marc Dietrich <marvin24@gmx.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00dev.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index dd87d41ac936..e5404e576251 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -588,7 +588,7 @@ static int rt2x00lib_rxdone_read_signal(struct rt2x00_dev *rt2x00dev,
588 return 0; 588 return 0;
589} 589}
590 590
591void rt2x00lib_rxdone(struct queue_entry *entry) 591void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp)
592{ 592{
593 struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev; 593 struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
594 struct rxdone_entry_desc rxdesc; 594 struct rxdone_entry_desc rxdesc;
@@ -608,7 +608,7 @@ void rt2x00lib_rxdone(struct queue_entry *entry)
608 * Allocate a new sk_buffer. If no new buffer available, drop the 608 * Allocate a new sk_buffer. If no new buffer available, drop the
609 * received frame and reuse the existing buffer. 609 * received frame and reuse the existing buffer.
610 */ 610 */
611 skb = rt2x00queue_alloc_rxskb(entry); 611 skb = rt2x00queue_alloc_rxskb(entry, gfp);
612 if (!skb) 612 if (!skb)
613 goto submit_entry; 613 goto submit_entry;
614 614