[ovs-dev] [PATCH v4 01/10] match: Add match_set_ct_zone_masked helper
Paul Blakey
paulb at mellanox.com
Mon Dec 16 12:06:53 UTC 2019
Sets zone in match.
Signed-off-by: Paul Blakey <paulb at mellanox.com>
Reviewed-by: Roi Dayan <roid at mellanox.com>
---
include/openvswitch/match.h | 2 ++
lib/match.c | 10 ++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/include/openvswitch/match.h b/include/openvswitch/match.h
index 05ecee7..eeabd5f 100644
--- a/include/openvswitch/match.h
+++ b/include/openvswitch/match.h
@@ -127,6 +127,8 @@ void match_set_pkt_mark_masked(struct match *, uint32_t pkt_mark, uint32_t mask)
void match_set_ct_state(struct match *, uint32_t ct_state);
void match_set_ct_state_masked(struct match *, uint32_t ct_state, uint32_t mask);
void match_set_ct_zone(struct match *, uint16_t ct_zone);
+void match_set_ct_zone_masked(struct match *match, uint16_t ct_zone,
+ uint16_t mask);
void match_set_ct_mark(struct match *, uint32_t ct_mark);
void match_set_ct_mark_masked(struct match *, uint32_t ct_mark, uint32_t mask);
void match_set_ct_label(struct match *, ovs_u128 ct_label);
diff --git a/lib/match.c b/lib/match.c
index ae56828..0d1ec31 100644
--- a/lib/match.c
+++ b/lib/match.c
@@ -417,8 +417,14 @@ match_set_ct_state_masked(struct match *match, uint32_t ct_state, uint32_t mask)
void
match_set_ct_zone(struct match *match, uint16_t ct_zone)
{
- match->flow.ct_zone = ct_zone;
- match->wc.masks.ct_zone = UINT16_MAX;
+ match_set_ct_zone_masked(match, ct_zone, UINT16_MAX);
+}
+
+void
+match_set_ct_zone_masked(struct match *match, uint16_t ct_zone, uint16_t mask)
+{
+ match->flow.ct_zone = ct_zone & mask;
+ match->wc.masks.ct_zone = mask;
}
void
--
1.8.3.1
More information about the dev
mailing list