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]
/
lib
/
meta-flow.h
diff --git
a/lib/meta-flow.h
b/lib/meta-flow.h
index
bc402dc
..
93b894d
100644
(file)
--- a/
lib/meta-flow.h
+++ b/
lib/meta-flow.h
@@
-41,7
+41,7
@@
enum mf_field_id {
MFF_IN_PORT, /* be16 */
MFF_IN_PORT_OXM, /* be32 */
MFF_SKB_PRIORITY, /* be32 */
- MFF_
SKB
_MARK, /* be32 */
+ MFF_
PKT
_MARK, /* be32 */
#if FLOW_N_REGS > 0
MFF_REG0, /* be32 */