---

yaml --- r: 183697 b: refs/heads/master c: 11380a4 h: refs/heads/master i: 183695: 3a2d654 v: v3
git-mirror · Jan 19, 2010 · 51dc457 · 51dc457
1 parent 091b2e7
commit 51dc457
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6373464288cab09bc641be301d8d30fc9f64ba71
+refs/heads/master: 11380a4b2d86fae9a6bce75c9373668cc323fe57
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
@@ -1527,7 +1527,6 @@ extern int		netif_rx(struct sk_buff *skb);
 extern int		netif_rx_ni(struct sk_buff *skb);
 #define HAVE_NETIF_RECEIVE_SKB 1
 extern int		netif_receive_skb(struct sk_buff *skb);
-extern void		napi_gro_flush(struct napi_struct *napi);
 extern gro_result_t	dev_gro_receive(struct napi_struct *napi,
 					struct sk_buff *skb);
 extern gro_result_t	napi_skb_finish(gro_result_t ret, struct sk_buff *skb);

diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -2582,7 +2582,7 @@ static int napi_gro_complete(struct sk_buff *skb)
 	return netif_receive_skb(skb);
 }
 
-void napi_gro_flush(struct napi_struct *napi)
+static void napi_gro_flush(struct napi_struct *napi)
 {
 	struct sk_buff *skb, *next;
 
@@ -2595,7 +2595,6 @@ void napi_gro_flush(struct napi_struct *napi)
 	napi->gro_count = 0;
 	napi->gro_list = NULL;
 }
-EXPORT_SYMBOL(napi_gro_flush);
 
 enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
 {