From 08d19ca9fef29b23826f1fb52e2368a9077783ca Mon Sep 17 00:00:00 2001 From: Pravin B Shelar Date: Thu, 22 Mar 2012 10:20:33 -0700 Subject: [PATCH] datapath: Move CSUM_MANGLED_0 definition to net checksum header. Following patch fixes compilation error on older kernel. Signed-off-by: Pravin B Shelar Acked-by: Jesse Gross --- datapath/linux/Modules.mk | 1 - datapath/linux/compat/include/linux/checksum.h | 10 ---------- datapath/linux/compat/include/net/checksum.h | 4 ++++ 3 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 datapath/linux/compat/include/linux/checksum.h diff --git a/datapath/linux/Modules.mk b/datapath/linux/Modules.mk index baa4196a..819247b0 100644 --- a/datapath/linux/Modules.mk +++ b/datapath/linux/Modules.mk @@ -13,7 +13,6 @@ openvswitch_sources += \ linux/compat/time.c \ linux/compat/workqueue.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 1d4fefce..00000000 --- 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 - -#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 ee64f24d..502d02d8 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 */ -- 2.30.2