interface-reconfigure: callout to datapath backend class method on rewrite

[openvswitch] / include / openvswitch / gre.h

diff --git a/include/openvswitch/gre.h b/include/openvswitch/gre.h
index 27417bb3ab260b726418f34dffa60869c58d3384..396a67d9d75167a250d4b94f61b1213325909c5a 100644 (file)
--- a/include/openvswitch/gre.h
+++ b/include/openvswitch/gre.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
  *
  * This file is offered under your choice of two licenses: Apache 2.0 or GNU
  * GPL 2.0 or later.  The permission statements for each of these licenses is
@@ -40,16 +40,7 @@
 #ifndef OPENVSWITCH_GRE_H
 #define OPENVSWITCH_GRE_H 1
 
-#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. */
@@ -69,35 +60,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 */