datapath: compat: Fix build on RHEL 6.6

RHEL 6.6 kernel percpu APIs are broken, so following patch is using OVS backported version. Reported-by: Wang Sheng-Hui <[email protected]> Signed-off-by: Pravin B Shelar <[email protected]>
dkarhi · Nov 19, 2014 · 3d174bf · 3d174bf
1 parent a2c3caf
commit 3d174bf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/datapath/linux/compat/include/linux/percpu.h b/datapath/linux/compat/include/linux/percpu.h
@@ -7,6 +7,12 @@
 #define this_cpu_ptr(ptr) per_cpu_ptr(ptr, smp_processor_id())
 #endif
 
+#ifdef HAVE_RHEL_OVS_HOOK
+#undef this_cpu_read
+#undef this_cpu_inc
+#undef this_cpu_dec
+#endif
+
 #if !defined this_cpu_read
 #define this_cpu_read(ptr) percpu_read(ptr)
 #endif

diff --git a/datapath/linux/compat/include/linux/skbuff.h b/datapath/linux/compat/include/linux/skbuff.h
@@ -302,7 +302,7 @@ static inline void skb_clear_hash(struct sk_buff *skb)
 #ifdef HAVE_RXHASH
 	skb->rxhash = 0;
 #endif
-#ifdef HAVE_L4_RXHASH
+#if defined(HAVE_L4_RXHASH) && !defined(HAVE_RHEL_OVS_HOOK)
 	skb->l4_rxhash = 0;
 #endif
 }