diff options
| author | Greg Rose <gvrose8192@gmail.com> | 2018-02-07 07:30:02 -0800 |
|---|---|---|
| committer | Pravin B Shelar <pshelar@ovn.org> | 2018-02-12 00:19:10 -0800 |
| commit | 47df6fb4e0ed5e230117f613b42bca75cbefdb5c (patch) | |
| tree | 4218ac5b73721f43af5630ab479985b988cd2416 | |
| parent | 86a94a96163ccd5d02cd3a3d6bcba2800109add4 (diff) | |
| download | openvswitch-47df6fb4e0ed5e230117f613b42bca75cbefdb5c.tar.gz | |
compat: Do not include headers when not compiling
If the entire file is not going to be compiled because OVS is using
upstream tunnel support then also don't bother pulling in the headers.
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
| -rw-r--r-- | datapath/linux/compat/ip_gre.c | 2 | ||||
| -rw-r--r-- | datapath/linux/compat/ip_output.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/datapath/linux/compat/ip_gre.c b/datapath/linux/compat/ip_gre.c index 94fdaa912..4e325914d 100644 --- a/datapath/linux/compat/ip_gre.c +++ b/datapath/linux/compat/ip_gre.c @@ -12,6 +12,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#ifndef USE_UPSTREAM_TUNNEL #include <linux/capability.h> #include <linux/module.h> #include <linux/types.h> @@ -52,7 +53,6 @@ #include <net/gre.h> #include <net/dst_metadata.h> -#ifndef USE_UPSTREAM_TUNNEL #if IS_ENABLED(CONFIG_IPV6) #include <net/ipv6.h> #include <net/ip6_fib.h> diff --git a/datapath/linux/compat/ip_output.c b/datapath/linux/compat/ip_output.c index edca34020..e2f869f9a 100644 --- a/datapath/linux/compat/ip_output.c +++ b/datapath/linux/compat/ip_output.c @@ -45,6 +45,7 @@ * Hirokazu Takahashi: sendfile() on UDP works now. */ +#ifndef HAVE_CORRECT_MRU_HANDLING #include <asm/uaccess.h> #include <linux/module.h> #include <linux/types.h> @@ -82,7 +83,6 @@ #include <linux/netlink.h> #include <linux/tcp.h> -#ifndef HAVE_CORRECT_MRU_HANDLING static inline void rpl_ip_options_fragment(struct sk_buff *skb) { unsigned char *optptr = skb_network_header(skb) + sizeof(struct iphdr); |