diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-07-16 13:15:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-16 13:17:49 +0200 |
| commit | 310e158cc3b7a6adf41e778d52be746c4dc88561 (patch) | |
| tree | 55088aba3d0db75427cf354b1c4771a081778a7c | |
| parent | sch_sfb: Fix missing NULL check (diff) | |
| download | linux-310e158cc3b7a6adf41e778d52be746c4dc88561.tar.xz linux-310e158cc3b7a6adf41e778d52be746c4dc88561.zip | |
net: respect GFP_DMA in __netdev_alloc_skb()
Few drivers use GFP_DMA allocations, and netdev_alloc_frag()
doesn't allocate pages in DMA zone.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -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 46a3d23d259e..d124306b81fd 100644 --- a/net/core/skbuff.c +++ b/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)) { |