From 1707693aade28bb3f3a58ad83d70c522ac3429f4 Mon Sep 17 00:00:00 2001 From: stephen hemminger Date: Tue, 19 Oct 2010 07:12:10 +0000 Subject: [PATCH] --- yaml --- r: 215435 b: refs/heads/master c: d0c2b0d265a0f1f92922a99a31def9da582197ac h: refs/heads/master i: 215433: 081346fd0d7d5177fed156f4d735156dff6378ef 215431: 583d1b06a3cd8664241c1cafc75ebfe0ca4e3e42 v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 2 -- trunk/net/core/dev.c | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0549684b446b..00bf80bc785e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0e00369f1e1ff9142a20efe4785890e52b2e525 +refs/heads/master: d0c2b0d265a0f1f92922a99a31def9da582197ac diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index ed7db7eebbf3..fcd3dda86322 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -1748,8 +1748,6 @@ extern gro_result_t napi_skb_finish(gro_result_t ret, struct sk_buff *skb); extern gro_result_t napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb); extern void napi_gro_flush(struct napi_struct *napi); -extern void napi_reuse_skb(struct napi_struct *napi, - struct sk_buff *skb); extern struct sk_buff * napi_get_frags(struct napi_struct *napi); extern gro_result_t napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb, diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 97fd6bc2004c..b2269ac04cb8 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -3301,7 +3301,7 @@ gro_result_t napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb) } EXPORT_SYMBOL(napi_gro_receive); -void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb) +static void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb) { __skb_pull(skb, skb_headlen(skb)); skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb)); @@ -3309,7 +3309,6 @@ void napi_reuse_skb(struct napi_struct *napi, struct sk_buff *skb) napi->skb = skb; } -EXPORT_SYMBOL(napi_reuse_skb); struct sk_buff *napi_get_frags(struct napi_struct *napi) {