[PATCH net-next] openvswitch: Fix build failure when CONFIG_INET not defined.
From: Pravin B Shelar <hidden>
Date: 2013-06-20 22:03:55
Subsystem:
networking [general], networking [ipv4/ipv6], the rest · Maintainers:
"David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, David Ahern, Ido Schimmel, Linus Torvalds
Adds CONFIG_INET guard for ip_tunnel header. Fixes following build error:- In file included from net/openvswitch/flow.c:43:0: include/net/ip_tunnels.h: In function 'tunnel_ip_select_ident':
quoted
include/net/ip_tunnels.h:155:3: error: implicit declaration of function '__ip_select_ident' [-Werror=implicit-function-declaration]
__ip_select_ident(iph, dst, Signed-off-by: Pravin B Shelar <redacted> --- include/net/ip_tunnels.h | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h
index 10bbb42..317f4a8 100644
--- a/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h@@ -18,6 +18,18 @@ #include <net/ip6_route.h> #endif +#define TUNNEL_CSUM __cpu_to_be16(0x01) +#define TUNNEL_ROUTING __cpu_to_be16(0x02) +#define TUNNEL_KEY __cpu_to_be16(0x04) +#define TUNNEL_SEQ __cpu_to_be16(0x08) +#define TUNNEL_STRICT __cpu_to_be16(0x10) +#define TUNNEL_REC __cpu_to_be16(0x20) +#define TUNNEL_VERSION __cpu_to_be16(0x40) +#define TUNNEL_NO_KEY __cpu_to_be16(0x80) +#define TUNNEL_DONT_FRAGMENT __cpu_to_be16(0x0100) + +#ifdef CONFIG_INET + /* Keep error state on tunnel for 30 sec */ #define IPTUNNEL_ERR_TIMEO (30*HZ)
@@ -65,16 +77,6 @@ struct ip_tunnel { struct gro_cells gro_cells; }; -#define TUNNEL_CSUM __cpu_to_be16(0x01) -#define TUNNEL_ROUTING __cpu_to_be16(0x02) -#define TUNNEL_KEY __cpu_to_be16(0x04) -#define TUNNEL_SEQ __cpu_to_be16(0x08) -#define TUNNEL_STRICT __cpu_to_be16(0x10) -#define TUNNEL_REC __cpu_to_be16(0x20) -#define TUNNEL_VERSION __cpu_to_be16(0x40) -#define TUNNEL_NO_KEY __cpu_to_be16(0x80) -#define TUNNEL_DONT_FRAGMENT __cpu_to_be16(0x0100) - struct tnl_ptk_info { __be16 flags; __be16 proto;
@@ -180,4 +182,6 @@ static inline void iptunnel_xmit_stats(int err, err_stats->tx_dropped++; } } + +#endif /* CONFIG_INET */ #endif /* __NET_IP_TUNNELS_H */
--
1.7.1