datapath: clear l4_rxhash in skb_clear_hash.

Signed-off-by: Pritesh Kothari <pritesh.kothari@cisco.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>

diff --git a/acinclude.m4 b/acinclude.m4
index b675e41..f51d66b 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -263,6 +263,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_reset_mac_len])
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_unclone])
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_orphan_frags])
+  OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [l4_rxhash])
 
   OVS_GREP_IFELSE([$KSRC/include/linux/types.h], [bool],
                   [OVS_DEFINE([HAVE_BOOL_TYPE])])

diff --git a/datapath/compat.h b/datapath/compat.h
index bc7e880..33632b0 100644 (file)
--- a/datapath/compat.h
+++ b/datapath/compat.h
@@ -27,9 +27,12 @@
 
 static inline void skb_clear_rxhash(struct sk_buff *skb)
 {
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)
+#if HAVE_RXHASH
        skb->rxhash = 0;
 #endif
+#if HAVE_L4_RXHASH
+       skb->l4_rxhash = 0;
+#endif
 }
 
 #ifdef HAVE_PARALLEL_OPS