[ovs-dev] [PATCH net-next 2/2] ip_tunnel: Protect tunnel functions with CONFIG_INET guard.

Jesse Gross jesse at nicira.com
Fri Jun 21 23:17:11 UTC 2013


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 at nicira.com>
Reported-by: Randy Dunlap <rdunlap at infradead.org>
Signed-off-by: Jesse Gross <jesse at nicira.com>
---
 include/net/ip_tunnels.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index 10bbb42..b0d9824 100644
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@ -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 */
-- 
1.8.1.2




More information about the dev mailing list