diff options
| author | Jesse Gross <jesse@nicira.com> | 2013-06-21 16:17:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-24 00:18:38 -0700 |
| commit | 5243b6ac9ed1310f2329b3d0a830a55589e518ea (patch) | |
| tree | 38d40653b4914e7216ba1a08d601d00ae88ebee1 | |
| 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>
| -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 { 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 */ |