From 6e2ae877948ae7fb7ec91c608c9f9e20bb0d3305 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 16 Jul 2012 13:15:52 +0200 Subject: [PATCH] --- yaml --- r: 312023 b: refs/heads/master c: 310e158cc3b7a6adf41e778d52be746c4dc88561 h: refs/heads/master i: 312021: 7f06b95854947f40bc9736d62c67585c58b0d64b 312019: 0a5fab11d1951f1b303002f3bcccf5c9f1052a3d 312015: 43bf77afd339a6c63dfa6134be993161e5553282 v: v3 --- [refs] | 2 +- trunk/net/core/skbuff.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9aa98e0fd8cf..3a895cdc04c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ac2908e4b2edaec60e9090ddb4d9ceb76c05e7d +refs/heads/master: 310e158cc3b7a6adf41e778d52be746c4dc88561 diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index 46a3d23d259e..d124306b81fd 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -353,7 +353,7 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int fragsz = SKB_DATA_ALIGN(length + NET_SKB_PAD) + SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); - if (fragsz <= PAGE_SIZE && !(gfp_mask & __GFP_WAIT)) { + if (fragsz <= PAGE_SIZE && !(gfp_mask & (__GFP_WAIT | GFP_DMA))) { void *data = netdev_alloc_frag(fragsz); if (likely(data)) {