From: Pritesh Kothari <pritesh.kothari@cisco.com>
Date: Thu, 1 May 2014 22:50:51 +0000 (-0700)
Subject: datapath: clear l4_rxhash in skb_clear_hash.
X-Git-Tag: v2.1.3~43
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=5fe756d877c579bb380295d255dd3390a6479fa0;hp=3297a44cfcae85f3b83437bf0ed514afe5385280;p=cascardo%2Fovs.git

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 b675e41a8..f51d66b9c 100644
--- 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 bc7e88055..33632b0ac 100644
--- 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