datapath: Move CSUM_MANGLED_0 definition to net checksum header.

Following patch fixes compilation error on older kernel.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>

diff --git a/datapath/linux/Modules.mk b/datapath/linux/Modules.mk
index baa4196ae2ce0e2eab69cf669ab34bb43f9fe8f5..819247b03ac5bca0f331b25b9c548b08fdd2b276 100644 (file)
--- 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 (file)
index 1d4fefc..0000000
--- 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 ee64f24d570e27a59cdf6bdc39375d54972992a6..502d02d8797f5244a8431dd0783bf4fe844b1f88 100644 (file)
--- 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 */