From 06ccfbb851c622638d58ed76f221b3ae83b8163a Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Mon, 15 Oct 2007 01:51:38 -0700
Subject: [PATCH] --- yaml --- r: 69415 b: refs/heads/master c:
 ad643a793bfb933e1b9e37ad4a5edf389ae160ea h: refs/heads/master i:   69413:
 650164e08865d489204cfe8e099107fc118df0a9   69411:
 d703e1afae8ff1db2953970b7c70db6b8b8cb2b6   69407:
 5a003b3eb2aa2a541e41872d3989081bcd419cd8 v: v3

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

diff --git a/[refs] b/[refs]
index 935ad0f6ce6b..c9161cb2eb29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c2842bd94dd72d77bddb498bdd76342a0089168
+refs/heads/master: ad643a793bfb933e1b9e37ad4a5edf389ae160ea
diff --git a/trunk/net/ipv6/ip6_input.c b/trunk/net/ipv6/ip6_input.c
index 9149fc239759..e7c85069a5db 100644
--- a/trunk/net/ipv6/ip6_input.c
+++ b/trunk/net/ipv6/ip6_input.c
@@ -149,7 +149,7 @@ int ipv6_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt
  */
 
 
-static inline int ip6_input_finish(struct sk_buff *skb)
+static int ip6_input_finish(struct sk_buff *skb)
 {
 	struct inet6_protocol *ipprot;
 	struct sock *raw_sk;
diff --git a/trunk/net/ipv6/ip6_output.c b/trunk/net/ipv6/ip6_output.c
index 011082ed921a..13565dfb1b45 100644
--- a/trunk/net/ipv6/ip6_output.c
+++ b/trunk/net/ipv6/ip6_output.c
@@ -70,7 +70,7 @@ static __inline__ void ipv6_select_ident(struct sk_buff *skb, struct frag_hdr *f
 	spin_unlock_bh(&ip6_id_lock);
 }
 
-static inline int ip6_output_finish(struct sk_buff *skb)
+static int ip6_output_finish(struct sk_buff *skb)
 {
 	struct dst_entry *dst = skb->dst;