From: Adrian Bunk <bunk@fs.tum.de>
Date: Sun, 13 Apr 2003 22:16:43 +0200
On Sat, Apr 12, 2003 at 06:08:52PM -0700, Andrew Morton wrote:
>...
> linus.patch
>
> Latest -bk
>...
The following compile error seems to come from Linus' tree:
This patch undoubtedly fixes it. I'm actually perplexed about that
GCC didn't at least warn about the fact that ipip_fb_tunnel_init() is
first declared static and then defined non-static.
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1179 -> 1.1180
# net/ipv4/xfrm4_tunnel.c 1.1 -> 1.2
# net/ipv4/ipip.c 1.26 -> 1.27
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/04/13 davem@nuts.ninka.net 1.1180
# [IPV4]: xfrm4_tunnel and ipip need to privateize some symbols.
# --------------------------------------------
#
diff -Nru a/net/ipv4/ipip.c b/net/ipv4/ipip.c
--- a/net/ipv4/ipip.c Sun Apr 13 16:39:07 2003
+++ b/net/ipv4/ipip.c Sun Apr 13 16:39:07 2003
@@ -208,7 +208,7 @@
write_unlock_bh(&ipip_lock);
}
-struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int create)
+static struct ip_tunnel * ipip_tunnel_locate(struct ip_tunnel_parm *parms, int create)
{
u32 remote = parms->iph.daddr;
u32 local = parms->iph.saddr;
@@ -286,7 +286,7 @@
dev_put(dev);
}
-void ipip_err(struct sk_buff *skb, void *__unused)
+static void ipip_err(struct sk_buff *skb, void *__unused)
{
#ifndef I_WISH_WORLD_WERE_PERFECT
@@ -478,7 +478,7 @@
IP_ECN_set_ce(inner_iph);
}
-int ipip_rcv(struct sk_buff *skb)
+static int ipip_rcv(struct sk_buff *skb)
{
struct iphdr *iph;
struct ip_tunnel *tunnel;
@@ -852,7 +852,7 @@
return 0;
}
-int __init ipip_fb_tunnel_init(struct net_device *dev)
+static int __init ipip_fb_tunnel_init(struct net_device *dev)
{
struct iphdr *iph;
diff -Nru a/net/ipv4/xfrm4_tunnel.c b/net/ipv4/xfrm4_tunnel.c
--- a/net/ipv4/xfrm4_tunnel.c Sun Apr 13 16:39:07 2003
+++ b/net/ipv4/xfrm4_tunnel.c Sun Apr 13 16:39:07 2003
@@ -163,7 +163,7 @@
return 0;
}
-void ipip_err(struct sk_buff *skb, u32 info)
+static void ipip_err(struct sk_buff *skb, u32 info)
{
struct xfrm_tunnel *handler = ipip_handler;
u32 arg = info;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Tue Apr 15 2003 - 22:00:29 EST