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.c
diff --git
a/lib/meta-flow.c
b/lib/meta-flow.c
index
11fdfaa
..
ce061a3
100644
(file)
--- a/
lib/meta-flow.c
+++ b/
lib/meta-flow.c
@@
-137,14
+137,14
@@
static const struct mf_field mf_fields[MFF_N_IDS] = {
0, NULL,
0, NULL,
}, {
0, NULL,
0, NULL,
}, {
- MFF_
SKB_MARK, "skb
_mark", NULL,
+ MFF_
PKT_MARK, "pkt
_mark", NULL,
MF_FIELD_SIZES(be32),
MF_FIELD_SIZES(be32),
- MFM_
NONE
,
+ MFM_
FULLY
,
MFS_HEXADECIMAL,
MFP_NONE,
MFS_HEXADECIMAL,
MFP_NONE,
-
fals
e,
-
0, NULL
,
-
0, NULL
,
+
tru
e,
+
NXM_NX_PKT_MARK, "NXM_NX_PKT_MARK"
,
+
NXM_NX_PKT_MARK, "NXM_NX_PKT_MARK"
,
},
#define REGISTER(IDX) \
},
#define REGISTER(IDX) \
@@
-706,8
+706,8
@@
mf_is_all_wild(const struct mf_field *mf, const struct flow_wildcards *wc)
return !wc->masks.in_port.ofp_port;
case MFF_SKB_PRIORITY:
return !wc->masks.skb_priority;
return !wc->masks.in_port.ofp_port;
case MFF_SKB_PRIORITY:
return !wc->masks.skb_priority;
- case MFF_
SKB
_MARK:
- return !wc->masks.
skb
_mark;
+ case MFF_
PKT
_MARK:
+ return !wc->masks.
pkt
_mark;
CASE_MFF_REGS:
return !wc->masks.regs[mf->id - MFF_REG0];
CASE_MFF_REGS:
return !wc->masks.regs[mf->id - MFF_REG0];
@@
-912,7
+912,7
@@
mf_is_value_valid(const struct mf_field *mf, const union mf_value *value)
case MFF_METADATA:
case MFF_IN_PORT:
case MFF_SKB_PRIORITY:
case MFF_METADATA:
case MFF_IN_PORT:
case MFF_SKB_PRIORITY:
- case MFF_
SKB
_MARK:
+ case MFF_
PKT
_MARK:
CASE_MFF_REGS:
case MFF_ETH_SRC:
case MFF_ETH_DST:
CASE_MFF_REGS:
case MFF_ETH_SRC:
case MFF_ETH_DST:
@@
-1026,8
+1026,8
@@
mf_get_value(const struct mf_field *mf, const struct flow *flow,
value->be32 = htonl(flow->skb_priority);
break;
value->be32 = htonl(flow->skb_priority);
break;
- case MFF_
SKB
_MARK:
- value->be32 = htonl(flow->
skb
_mark);
+ case MFF_
PKT
_MARK:
+ value->be32 = htonl(flow->
pkt
_mark);
break;
CASE_MFF_REGS:
break;
CASE_MFF_REGS:
@@
-1216,8
+1216,8
@@
mf_set_value(const struct mf_field *mf,
match_set_skb_priority(match, ntohl(value->be32));
break;
match_set_skb_priority(match, ntohl(value->be32));
break;
- case MFF_
SKB
_MARK:
- match_set_
skb
_mark(match, ntohl(value->be32));
+ case MFF_
PKT
_MARK:
+ match_set_
pkt
_mark(match, ntohl(value->be32));
break;
CASE_MFF_REGS:
break;
CASE_MFF_REGS:
@@
-1405,8
+1405,8
@@
mf_set_flow_value(const struct mf_field *mf,
flow->skb_priority = ntohl(value->be32);
break;
flow->skb_priority = ntohl(value->be32);
break;
- case MFF_
SKB
_MARK:
- flow->
skb
_mark = ntohl(value->be32);
+ case MFF_
PKT
_MARK:
+ flow->
pkt
_mark = ntohl(value->be32);
break;
CASE_MFF_REGS:
break;
CASE_MFF_REGS:
@@
-1607,9
+1607,9
@@
mf_set_wild(const struct mf_field *mf, struct match *match)
match->wc.masks.skb_priority = 0;
break;
match->wc.masks.skb_priority = 0;
break;
- case MFF_
SKB
_MARK:
- match->flow.
skb
_mark = 0;
- match->wc.masks.
skb
_mark = 0;
+ case MFF_
PKT
_MARK:
+ match->flow.
pkt
_mark = 0;
+ match->wc.masks.
pkt
_mark = 0;
break;
CASE_MFF_REGS:
break;
CASE_MFF_REGS:
@@
-1780,7
+1780,6
@@
mf_set(const struct mf_field *mf,
switch (mf->id) {
case MFF_IN_PORT:
case MFF_IN_PORT_OXM:
switch (mf->id) {
case MFF_IN_PORT:
case MFF_IN_PORT_OXM:
- case MFF_SKB_MARK:
case MFF_SKB_PRIORITY:
case MFF_ETH_TYPE:
case MFF_DL_VLAN:
case MFF_SKB_PRIORITY:
case MFF_ETH_TYPE:
case MFF_DL_VLAN:
@@
-1829,6
+1828,11
@@
mf_set(const struct mf_field *mf,
ntohl(value->be32), ntohl(mask->be32));
break;
ntohl(value->be32), ntohl(mask->be32));
break;
+ case MFF_PKT_MARK:
+ match_set_pkt_mark_masked(match, ntohl(value->be32),
+ ntohl(mask->be32));
+ break;
+
case MFF_ETH_DST:
match_set_dl_dst_masked(match, value->mac, mask->mac);
break;
case MFF_ETH_DST:
match_set_dl_dst_masked(match, value->mac, mask->mac);
break;
@@
-1985,7
+1989,7
@@
mf_random_value(const struct mf_field *mf, union mf_value *value)
case MFF_TUN_FLAGS:
case MFF_METADATA:
case MFF_IN_PORT:
case MFF_TUN_FLAGS:
case MFF_METADATA:
case MFF_IN_PORT:
- case MFF_
SKB
_MARK:
+ case MFF_
PKT
_MARK:
case MFF_SKB_PRIORITY:
CASE_MFF_REGS:
case MFF_ETH_SRC:
case MFF_SKB_PRIORITY:
CASE_MFF_REGS:
case MFF_ETH_SRC: