From 62480ec589d46c16dec3732a23530966a58778c8 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Tue, 29 Nov 2005 16:28:56 -0800
Subject: [PATCH] --- yaml --- r: 14801 b: refs/heads/master c:
 34a0b3cdc078746788ffc49e56da0db62b8b6ea4 h: refs/heads/master i:   14799:
 3cd3470b9ad9ef8e61529580bcf140b1e2e76605 v: v3

---
 [refs]                         | 2 +-
 trunk/net/ipv6/ip6_output.c    | 3 ++-
 trunk/net/ipv6/ipv6_sockglue.c | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index e3ad18207bca..467c47994c37 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d127e94a5cf1c9c996b8c67cd2595b96c3e35e4c
+refs/heads/master: 34a0b3cdc078746788ffc49e56da0db62b8b6ea4
diff --git a/trunk/net/ipv6/ip6_output.c b/trunk/net/ipv6/ip6_output.c
index c1fa693511a1..8523c76ebf76 100644
--- a/trunk/net/ipv6/ip6_output.c
+++ b/trunk/net/ipv6/ip6_output.c
@@ -774,7 +774,8 @@ int ip6_dst_lookup(struct sock *sk, struct dst_entry **dst, struct flowi *fl)
 	*dst = NULL;
 	return err;
 }
-inline int ip6_ufo_append_data(struct sock *sk,
+
+static inline int ip6_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,
diff --git a/trunk/net/ipv6/ipv6_sockglue.c b/trunk/net/ipv6/ipv6_sockglue.c
index 25757ade989f..3620718defe6 100644
--- a/trunk/net/ipv6/ipv6_sockglue.c
+++ b/trunk/net/ipv6/ipv6_sockglue.c
@@ -628,8 +628,8 @@ int ipv6_setsockopt(struct sock *sk, int level, int optname,
 	return -EINVAL;
 }
 
-int ipv6_getsockopt_sticky(struct sock *sk, struct ipv6_opt_hdr *hdr,
-			   char __user *optval, int len)
+static int ipv6_getsockopt_sticky(struct sock *sk, struct ipv6_opt_hdr *hdr,
+				  char __user *optval, int len)
 {
 	if (!hdr)
 		return 0;