diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-29 01:39:26 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-29 01:39:26 -0400 |
| commit | 5b85f29ca453d56d83cdffa075d615583bb8fb72 (patch) | |
| tree | a553754dcef01a22a6bd6e2eeb2fd4eb69bf5b37 /include/linux/skbuff.h | |
| parent | 48cb37bd9e053429aacb7c2726da3300aba60c68 (diff) | |
| parent | ab3b3fd38125be0242c2f94bf144b48054210882 (diff) | |
| download | kernel-crypto-5b85f29ca453d56d83cdffa075d615583bb8fb72.tar.gz kernel-crypto-5b85f29ca453d56d83cdffa075d615583bb8fb72.tar.xz kernel-crypto-5b85f29ca453d56d83cdffa075d615583bb8fb72.zip | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 0bf31b83578..4307e764ef0 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1066,9 +1066,8 @@ 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 + * __dev_alloc_skb - allocate an skbuff for receiving * @length: length to allocate * @gfp_mask: get_free_pages mask, passed to alloc_skb * @@ -1087,12 +1086,9 @@ 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 + * dev_alloc_skb - allocate an skbuff for receiving * @length: length to allocate * * Allocate a new &sk_buff and assign it a usage count of one. The |