[NET]: Use might_sleep in alloc_skb.

9c0873e5 · David S. Miller · 12e94878 · 9c0873e5
Commit 9c0873e5 authored Mar 30, 2003 by David S. Miller
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 9 deletions

net/core/skbuff.c net/core/skbuff.c +2 -9

No files found.
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -170,15 +170,8 @@ struct sk_buff *alloc_skb(unsigned int size, int gfp_mask)
 	struct sk_buff *skb;
 	u8 *data;
-	if (in_interrupt() && (gfp_mask & __GFP_WAIT)) {
+	if (gfp_mask & __GFP_WAIT)
-		static int count;
+		might_sleep();
-		if (++count < 5) {
-			printk(KERN_ERR "alloc_skb called nonatomically "
-			       "from interrupt %p\n", NET_CALLER(size));
- 			BUG();
-		}
-		gfp_mask &= ~__GFP_WAIT;
-	}
 	/* Get the HEAD */
 	skb = skb_head_from_pool();