X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fopenvswitch%2Fgre.h;h=3c5691b0e16698adf4cfc64f98a14a880e9f912e;hb=58bc1a52cb0b88f8f44b175f13f602e650bc9d06;hp=7f2465a5ee3c7d446f21826807f52d2655628d31;hpb=3fe8053b36da715c411b907ac125e41f9e9a28f2;p=openvswitch

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 */