From b22879151a02d10f81997134fd78ab68e08339d7 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Fri, 8 Feb 2013 10:17:15 +0000 Subject: [PATCH] --- yaml --- r: 352374 b: refs/heads/master c: e5e67305885eb12849b5475764b0542f03dc2b59 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/skbuff.h | 4 ++++ trunk/net/core/skbuff.c | 4 ---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cac148fa5b12..675a6edff4f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfb235d78387c4fd38e296ed7bd9a4f2b0a5b2b9 +refs/heads/master: e5e67305885eb12849b5475764b0542f03dc2b59 diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h index 0259b719bebf..d7573c37a51d 100644 --- a/trunk/include/linux/skbuff.h +++ b/trunk/include/linux/skbuff.h @@ -1832,6 +1832,10 @@ static inline void __skb_queue_purge(struct sk_buff_head *list) kfree_skb(skb); } +#define NETDEV_FRAG_PAGE_MAX_ORDER get_order(32768) +#define NETDEV_FRAG_PAGE_MAX_SIZE (PAGE_SIZE << NETDEV_FRAG_PAGE_MAX_ORDER) +#define NETDEV_PAGECNT_MAX_BIAS NETDEV_FRAG_PAGE_MAX_SIZE + extern void *netdev_alloc_frag(unsigned int fragsz); extern struct sk_buff *__netdev_alloc_skb(struct net_device *dev, diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index 55f7ef6ada6d..6114c1143564 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -351,10 +351,6 @@ struct netdev_alloc_cache { }; static DEFINE_PER_CPU(struct netdev_alloc_cache, netdev_alloc_cache); -#define NETDEV_FRAG_PAGE_MAX_ORDER get_order(32768) -#define NETDEV_FRAG_PAGE_MAX_SIZE (PAGE_SIZE << NETDEV_FRAG_PAGE_MAX_ORDER) -#define NETDEV_PAGECNT_MAX_BIAS NETDEV_FRAG_PAGE_MAX_SIZE - static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask) { struct netdev_alloc_cache *nc;