ip_tunnel: Protect tunnel functions with CONFIG_INET guard.
authorJesse Gross <jesse@nicira.com>
Fri, 21 Jun 2013 23:17:11 +0000 (16:17 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Jun 2013 07:18:38 +0000 (00:18 -0700)
Tunnel constants can be used in generic code but in these cases
the inline functions in ip_tunnels.h cause compilation problems
if CONFIG_INET is not set.

CC: Pravin Shelar <pshelar@nicira.com>
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/ip_tunnels.h

index 10bbb4273f7da4db28d65e14241d23de53d7070b..b0d982471a5c299943497dd45b4eda4932ce084a 100644 (file)
@@ -93,6 +93,8 @@ struct ip_tunnel_net {
        struct net_device *fb_tunnel_dev;
 };
 
+#ifdef CONFIG_INET
+
 int ip_tunnel_init(struct net_device *dev);
 void ip_tunnel_uninit(struct net_device *dev);
 void  ip_tunnel_dellink(struct net_device *dev, struct list_head *head);
@@ -180,4 +182,7 @@ static inline void iptunnel_xmit_stats(int err,
                err_stats->tx_dropped++;
        }
 }
+
+#endif /* CONFIG_INET */
+
 #endif /* __NET_IP_TUNNELS_H */