diff options
| author | Jesse Gross <jesse@nicira.com> | 2010-04-08 10:22:35 -0400 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2010-04-19 09:11:58 -0400 |
| commit | 6f643e4946016399f0b217c2226284e3892b6267 (patch) | |
| tree | b9e5e65fa384c24cc8745a4e7dc9e3cd920ed67f /include | |
| parent | 3fe8053b36da715c411b907ac125e41f9e9a28f2 (diff) | |
tunneling: Remove old GRE implementation.
The new GRE implementation provides a complete drop in replacement
for the old Linux based implementation. Therefore, remove the
old implementation and rename "grenew" to "gre".
Diffstat (limited to 'include')
| -rw-r--r-- | include/openvswitch/gre.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/include/openvswitch/gre.h b/include/openvswitch/gre.h index 7f2465a5..3c5691b0 100644 --- a/include/openvswitch/gre.h +++ b/include/openvswitch/gre.h @@ -40,18 +40,12 @@ #ifndef OPENVSWITCH_GRE_H #define OPENVSWITCH_GRE_H 1 -#include <linux/ip.h> -#include <linux/if_tunnel.h> -#include <linux/version.h> - #ifdef __KERNEL__ #include <linux/types.h> #else #include <sys/types.h> #endif -/* New GRE config. */ - #define GRE_F_IN_CSUM (1 << 0) /* Require incoming packets to have checksums. */ #define GRE_F_OUT_CSUM (1 << 1) /* Checksum outgoing packets. */ #define GRE_F_IN_KEY_MATCH (1 << 2) /* Store the key in tun_id to match in flow table. */ @@ -70,35 +64,4 @@ struct gre_port_config { __u8 ttl; }; -/* Old GRE config. */ - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,23) -#define GRE_IOCTL_ONLY -#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) -enum -{ - IFLA_GRE_UNSPEC, - IFLA_GRE_LINK, - IFLA_GRE_IFLAGS, - IFLA_GRE_OFLAGS, - IFLA_GRE_IKEY, - IFLA_GRE_OKEY, - IFLA_GRE_LOCAL, - IFLA_GRE_REMOTE, - IFLA_GRE_TTL, - IFLA_GRE_TOS, - IFLA_GRE_PMTUDISC, - __IFLA_GRE_MAX, -}; - -#define IFLA_GRE_MAX (__IFLA_GRE_MAX - 1) -#endif - -#define GRE_IOCTL_DEVICE "gre0" - -#define SIOCGETGRETAP SIOCGETTUNNEL -#define SIOCADDGRETAP (SIOCDEVPRIVATE + 10) -#define SIOCDELGRETAP SIOCDELTUNNEL -#define SIOCCHGGRETAP (SIOCDEVPRIVATE + 11) - #endif /* openvswitch/gre.h */ |