[IPV4]: xfrm4_tunnel and ipip need to privateize some symbols.

diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
index 28c17a319eaeda901d1a8d4d68675e615386f3c2..be61533ccf9348ea4e5b6d4c3d441b30fc2b0399 100644 (file)
--- a/net/ipv4/ipip.c
+++ b/net/ipv4/ipip.c
@@ -208,7 +208,7 @@ static void ipip_tunnel_link(struct ip_tunnel *t)
        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 @@ static void ipip_tunnel_uninit(struct net_device *dev)
        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 @@ static inline void ipip_ecn_decapsulate(struct iphdr *outer_iph, struct sk_buff
                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 @@ static int ipip_tunnel_init(struct net_device *dev)
        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 --git a/net/ipv4/xfrm4_tunnel.c b/net/ipv4/xfrm4_tunnel.c
index c4fe071b56b524f22729d172e9e9a17926bf35c5..f18722ad31d14434deec5e4fd4ab6e061ffaa474 100644 (file)
--- a/net/ipv4/xfrm4_tunnel.c
+++ b/net/ipv4/xfrm4_tunnel.c
@@ -163,7 +163,7 @@ out:
        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;