git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
datapath
/
linux
/
compat
/
flow_dissector.c
diff --git
a/datapath/linux/compat/flow_dissector.c
b/datapath/linux/compat/flow_dissector.c
index
f176f9a
..
7a0d09b
100644
(file)
--- a/
datapath/linux/compat/flow_dissector.c
+++ b/
datapath/linux/compat/flow_dissector.c
@@
-226,7
+226,7
@@
u32 __skb_get_rxhash(struct sk_buff *skb)
if (!hash)
hash = 1;
-#if
LINUX_VERSION_CODE > KERNEL_VERSION(2,6,34)
+#if
def HAVE_RXHASH
skb->rxhash = hash;
#endif
return hash;