---

yaml --- r: 32819 b: refs/heads/master c: 37182d1 h: refs/heads/master i: 32817: 8916646 32815: 567f67f v: v3
git-mirror · Jul 24, 2006 · e80d1b1 · e80d1b1
1 parent 0d8ca52
commit e80d1b1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c753c3d3be0f8d1b570ec5720ad1bb4caf8232b
+refs/heads/master: 37182d1bd3264cf9c0dce3408bee48af0755de7e
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
@@ -1066,7 +1066,6 @@ static inline void __skb_queue_purge(struct sk_buff_head *list)
 		kfree_skb(skb);
 }
 
-#ifndef CONFIG_HAVE_ARCH_DEV_ALLOC_SKB
 /**
  *	__dev_alloc_skb - allocate an skbuff for sending
  *	@length: length to allocate
@@ -1087,9 +1086,6 @@ static inline struct sk_buff *__dev_alloc_skb(unsigned int length,
 		skb_reserve(skb, NET_SKB_PAD);
 	return skb;
 }
-#else
-extern struct sk_buff *__dev_alloc_skb(unsigned int length, int gfp_mask);
-#endif
 
 /**
  *	dev_alloc_skb - allocate an skbuff for sending