| Message ID | 1371856631-47807-2-git-send-email-jesse@nicira.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 06/21/13 16:17, Jesse Gross wrote: > 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> Thanks. > --- > 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 */ >
From: Jesse Gross <jesse@nicira.com> Date: Fri, 21 Jun 2013 16:17:11 -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> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 */
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> --- include/net/ip_tunnels.h | 5 +++++ 1 file changed, 5 insertions(+)