Skip to content

Commit

Permalink
ip_tunnel: Protect tunnel functions with CONFIG_INET guard.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jesse Gross authored and David S. Miller committed Jun 24, 2013
1 parent 479b1a5 commit 5243b6a
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions include/net/ip_tunnels.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -180,4 +182,7 @@ static inline void iptunnel_xmit_stats(int err,
err_stats->tx_dropped++;
}
}

#endif /* CONFIG_INET */

#endif /* __NET_IP_TUNNELS_H */

0 comments on commit 5243b6a

Please sign in to comment.