From 51dc4574bc82a650783f5a869e8d72d7e4fe81e6 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 19 Jan 2010 13:46:10 -0800
Subject: [PATCH] --- yaml --- r: 183697 b: refs/heads/master c:
 11380a4b2d86fae9a6bce75c9373668cc323fe57 h: refs/heads/master i:   183695:
 3a2d65494cba927c93ce988f56865afc90790f8c v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/netdevice.h | 1 -
 trunk/net/core/dev.c            | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 551db8b45728..0036913e1381 100644
--- 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
index a3fccc85b1a0..468a11dea58c 100644
--- 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
index a008f6987a95..5747b9edc1bb 100644
--- 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)
 {