From 51ae3463616ad62460324c21dcc6f3d4367aabcd Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Sat, 7 Jan 2006 13:23:39 -0800
Subject: [PATCH] --- yaml --- r: 16817 b: refs/heads/master c:
 97dc627fb3471664c72d0933790a90ba3f91e131 h: refs/heads/master i:   16815:
 f6cf0c28a10f4d5f04f59c6b59a6b7dc23edd2e1 v: v3

---
 [refs]                     | 2 +-
 trunk/include/net/ip.h     | 1 -
 trunk/net/ipv4/ip_output.c | 5 +++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9cc1a07e9286..d190a8363b5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f53b61d8c385140fe7f09e0c9187ae813ee9f330
+refs/heads/master: 97dc627fb3471664c72d0933790a90ba3f91e131
diff --git a/trunk/include/net/ip.h b/trunk/include/net/ip.h
index a494d04e5dea..8de0697b364c 100644
--- a/trunk/include/net/ip.h
+++ b/trunk/include/net/ip.h
@@ -94,7 +94,6 @@ extern int		ip_local_deliver(struct sk_buff *skb);
 extern int		ip_mr_input(struct sk_buff *skb);
 extern int		ip_output(struct sk_buff *skb);
 extern int		ip_mc_output(struct sk_buff *skb);
-extern int		ip_fragment(struct sk_buff *skb, int (*out)(struct sk_buff*));
 extern int		ip_do_nat(struct sk_buff *skb);
 extern void		ip_send_check(struct iphdr *ip);
 extern int		ip_queue_xmit(struct sk_buff *skb, int ipfragok);
diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c
index 59fdac3a099a..c2169b47ddfd 100644
--- a/trunk/net/ipv4/ip_output.c
+++ b/trunk/net/ipv4/ip_output.c
@@ -85,6 +85,8 @@
 
 int sysctl_ip_default_ttl = IPDEFTTL;
 
+static int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*));
+
 /* Generate a checksum for an outgoing IP datagram. */
 __inline__ void ip_send_check(struct iphdr *iph)
 {
@@ -414,7 +416,7 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from)
  *	single device frame, and queue such a frame for sending.
  */
 
-int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
+static int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
 {
 	struct iphdr *iph;
 	int raw = 0;
@@ -1396,7 +1398,6 @@ void __init ip_init(void)
 #endif
 }
 
-EXPORT_SYMBOL(ip_fragment);
 EXPORT_SYMBOL(ip_generic_getfrag);
 EXPORT_SYMBOL(ip_queue_xmit);
 EXPORT_SYMBOL(ip_send_check);