From 3cd3470b9ad9ef8e61529580bcf140b1e2e76605 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 29 Nov 2005 16:27:20 -0800
Subject: [PATCH] --- yaml --- r: 14799 b: refs/heads/master c:
 4b30b1c6a3e58dc74f2dbb0aa39f16a23cfcdd56 h: refs/heads/master i:   14797:
 72a08f749bab96749910eb0754dfc21152bd2561   14795:
 279a8ddc3477e1801e8ecb5a0e8262c1e3cf7153   14791:
 c9f4e59c301ccf254e281c660a7000af7ef41b88   14783:
 2c090f6c7d61d2eeeccb1447d438e9b4f6035e08 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/ip_gre.c    | 2 +-
 trunk/net/ipv4/ip_output.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c61ed0edf387..7e5f872b1040 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b5b5cff9a6655dbb6d2e2be365bb95eec3950eb
+refs/heads/master: 4b30b1c6a3e58dc74f2dbb0aa39f16a23cfcdd56
diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c
index 4e9c74b54b15..a4c347c3b8e3 100644
--- a/trunk/net/ipv4/ip_gre.c
+++ b/trunk/net/ipv4/ip_gre.c
@@ -1217,7 +1217,7 @@ static int ipgre_tunnel_init(struct net_device *dev)
 	return 0;
 }
 
-int __init ipgre_fb_tunnel_init(struct net_device *dev)
+static int __init ipgre_fb_tunnel_init(struct net_device *dev)
 {
 	struct ip_tunnel *tunnel = (struct ip_tunnel*)dev->priv;
 	struct iphdr *iph = &tunnel->parms.iph;
diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c
index 11c2f68254f0..eba64e2bd397 100644
--- a/trunk/net/ipv4/ip_output.c
+++ b/trunk/net/ipv4/ip_output.c
@@ -690,7 +690,7 @@ csum_page(struct page *page, int offset, int copy)
 	return csum;
 }
 
-inline int ip_ufo_append_data(struct sock *sk,
+static inline int ip_ufo_append_data(struct sock *sk,
 			int getfrag(void *from, char *to, int offset, int len,
 			       int odd, struct sk_buff *skb),
 			void *from, int length, int hh_len, int fragheaderlen,