diff options
author | Jesse Gross <jesse@nicira.com> | 2013-06-21 19:17:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-06-24 03:18:38 -0400 |
commit | 5243b6ac9ed1310f2329b3d0a830a55589e518ea (patch) | |
tree | 38d40653b4914e7216ba1a08d601d00ae88ebee1 /include/net | |
parent | 479b1a5825f68f9b63d26a13ca25ffbb7d2617ad (diff) |
ip_tunnel: Protect tunnel functions with CONFIG_INET guard.
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>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/ip_tunnels.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h index 10bbb4273f7d..b0d982471a5c 100644 --- a/include/net/ip_tunnels.h +++ b/include/net/ip_tunnels.h | |||
@@ -93,6 +93,8 @@ struct ip_tunnel_net { | |||
93 | struct net_device *fb_tunnel_dev; | 93 | struct net_device *fb_tunnel_dev; |
94 | }; | 94 | }; |
95 | 95 | ||
96 | #ifdef CONFIG_INET | ||
97 | |||
96 | int ip_tunnel_init(struct net_device *dev); | 98 | int ip_tunnel_init(struct net_device *dev); |
97 | void ip_tunnel_uninit(struct net_device *dev); | 99 | void ip_tunnel_uninit(struct net_device *dev); |
98 | void ip_tunnel_dellink(struct net_device *dev, struct list_head *head); | 100 | void ip_tunnel_dellink(struct net_device *dev, struct list_head *head); |
@@ -180,4 +182,7 @@ static inline void iptunnel_xmit_stats(int err, | |||
180 | err_stats->tx_dropped++; | 182 | err_stats->tx_dropped++; |
181 | } | 183 | } |
182 | } | 184 | } |
185 | |||
186 | #endif /* CONFIG_INET */ | ||
187 | |||
183 | #endif /* __NET_IP_TUNNELS_H */ | 188 | #endif /* __NET_IP_TUNNELS_H */ |