From 3256fe5b437c9b807b15ad011400d792070b7a30 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Mon, 23 Jan 2006 16:32:45 -0800 Subject: [PATCH] --- yaml --- r: 19046 b: refs/heads/master c: 8798b3fb714477f5c88dde102c149d2b3e1d8def h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/skbuff.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d8f8bd6267c3..a858eabd26dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40727198bfb2ce5842a6e8c7f89cf8a40ff7bf14 +refs/heads/master: 8798b3fb714477f5c88dde102c149d2b3e1d8def diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index d0732e9c8560..6766f118f070 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -135,13 +135,15 @@ void skb_under_panic(struct sk_buff *skb, int sz, void *here) struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, int fclone) { + kmem_cache_t *cache; struct skb_shared_info *shinfo; struct sk_buff *skb; u8 *data; + cache = fclone ? skbuff_fclone_cache : skbuff_head_cache; + /* Get the HEAD */ - skb = kmem_cache_alloc(fclone ? skbuff_fclone_cache : skbuff_head_cache, - gfp_mask & ~__GFP_DMA); + skb = kmem_cache_alloc(cache, gfp_mask & ~__GFP_DMA); if (!skb) goto out; @@ -180,7 +182,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, out: return skb; nodata: - kmem_cache_free(skbuff_head_cache, skb); + kmem_cache_free(cache, skb); skb = NULL; goto out; }