diff options
| author | Pravin B Shelar <pshelar@nicira.com> | 2012-03-22 10:20:33 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-10-25 12:35:43 -0700 |
| commit | d2e120a872a7d39b280137c16476ecc3230d4154 (patch) | |
| tree | f2a9c1eb76dab950a20dc61f1a55487cfa56eb79 | |
| parent | d935ca5de818c5eeb7bbd575be623e2dcbd65492 (diff) | |
| download | openvswitch-d2e120a872a7d39b280137c16476ecc3230d4154.tar.gz | |
datapath: Move CSUM_MANGLED_0 definition to net checksum header.
Following patch fixes compilation error on older kernel.
This is a crossport of commit 08d19ca9fef29b23826f1fb52e2368a9077783ca
from master.
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
| -rw-r--r-- | datapath/linux/Modules.mk | 1 | ||||
| -rw-r--r-- | datapath/linux/compat/include/linux/checksum.h | 10 | ||||
| -rw-r--r-- | datapath/linux/compat/include/net/checksum.h | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/datapath/linux/Modules.mk b/datapath/linux/Modules.mk index baaebb0ca..1f9973b47 100644 --- a/datapath/linux/Modules.mk +++ b/datapath/linux/Modules.mk @@ -10,7 +10,6 @@ openvswitch_sources += \ linux/compat/skbuff-openvswitch.c \ linux/compat/time.c openvswitch_headers += \ - linux/compat/include/linux/checksum.h \ linux/compat/include/linux/compiler.h \ linux/compat/include/linux/compiler-gcc.h \ linux/compat/include/linux/cpumask.h \ diff --git a/datapath/linux/compat/include/linux/checksum.h b/datapath/linux/compat/include/linux/checksum.h deleted file mode 100644 index 1d4fefce3..000000000 --- a/datapath/linux/compat/include/linux/checksum.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __LINUX_CHECKSUM_WRAPPER_H -#define __LINUX_CHECKSUM_WRAPPER_H 1 - -#include_next <linux/checksum.h> - -#ifndef CSUM_MANGLED_0 -#define CSUM_MANGLED_0 ((__force __sum16)0xffff) -#endif - -#endif diff --git a/datapath/linux/compat/include/net/checksum.h b/datapath/linux/compat/include/net/checksum.h index ee64f24d5..502d02d87 100644 --- a/datapath/linux/compat/include/net/checksum.h +++ b/datapath/linux/compat/include/net/checksum.h @@ -38,4 +38,8 @@ static inline void csum_replace2(__sum16 *sum, __be16 from, __be16 to) (__force __be32)(to), pseudohdr) #endif +#ifndef CSUM_MANGLED_0 +#define CSUM_MANGLED_0 ((__force __sum16)0xffff) +#endif + #endif /* checksum.h */ |