diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-05-26 10:09:56 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-05-26 15:27:01 -0700 |
| commit | b662d24bd42f182a3ad1e9ca7ecb5ab2aa037480 (patch) | |
| tree | db19a63644d275d797771dd318774e155d64cc21 | |
| parent | 0ec6cfb13b4d9ef14b90119cf662e47ed559a185 (diff) | |
| download | openvswitch-b662d24bd42f182a3ad1e9ca7ecb5ab2aa037480.tar.gz | |
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.
| -rw-r--r-- | include/openvswitch/gre.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/openvswitch/gre.h b/include/openvswitch/gre.h index 3c5691b0e..396a67d9d 100644 --- 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. */ |