Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-06-13 23:56:52 -07:00
parent a2f0fad32b c8d17b451a
commit 25c43bf13b
38 changed files with 200 additions and 88 deletions
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -4467,7 +4467,7 @@ struct sk_buff *alloc_skb_with_frags(unsigned long header_len,

 		while (order) {
 			if (npages >= 1 << order) {
-				page = alloc_pages(gfp_mask |
+				page = alloc_pages((gfp_mask & ~__GFP_WAIT) |
 						   __GFP_COMP |
 						   __GFP_NOWARN |
 						   __GFP_NORETRY,