datapath: Make gre.h safe to include by itself.

gre.h is Linux-specific, and it uses Linux-specific types, so it has to
#include <linux/types.h>.  We probably got away with it until now because
it was always included after some other header that had already included
that one.

diff --git a/include/openvswitch/gre.h b/include/openvswitch/gre.h
index 3c5691b0e16698adf4cfc64f98a14a880e9f912e..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,11 +40,7 @@
 #ifndef OPENVSWITCH_GRE_H
 #define OPENVSWITCH_GRE_H 1
 
-#ifdef __KERNEL__
 #include <linux/types.h>
-#else
-#include <sys/types.h>
-#endif
 
 #define GRE_F_IN_CSUM          (1 << 0) /* Require incoming packets to have checksums. */
 #define GRE_F_OUT_CSUM         (1 << 1) /* Checksum outgoing packets. */