---

yaml --- r: 312023 b: refs/heads/master c: 310e158 h: refs/heads/master i: 312021: 7f06b95 312019: 0a5fab1 312015: 43bf77a v: v3
git-mirror · Jul 16, 2012 · 6e2ae87 · 6e2ae87
1 parent 7eee2d5
commit 6e2ae87
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)) {