diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-13 23:56:52 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-13 23:56:52 -0700 |
| commit | 25c43bf13b1657d9a2f6a2565e9159ce31517aa5 (patch) | |
| tree | c1fef736d3227dbd3788206c746d00763247f232 /net/core/skbuff.c | |
| parent | a2f0fad32b0d0022c7e5706d333d74a9579f3742 (diff) | |
| parent | c8d17b451aa18b07b60e771addf17a5fdd4138c7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 9bac0e6f8dfa..b6a19ca0f99e 100644 --- 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, |