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
/
flow.h
diff --git
a/datapath/flow.h
b/datapath/flow.h
index
eda74f3
..
03eae03
100644
(file)
--- a/
datapath/flow.h
+++ b/
datapath/flow.h
@@
-127,7
+127,7
@@
struct sw_flow_key {
} nd;
} ipv6;
};
-} __aligned(
__alignof__(long));
+} __aligned(
BITS_PER_LONG/8); /* Ensure that we can do comparisons as longs. */
struct sw_flow {
struct rcu_head rcu;