X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fclassifier.c;h=d1f9d5ddc0336a549786804226bbbe5b97237719;hb=3a48ace3e4799ce25099a8584372abe7a4d6d771;hp=730cae84205c3361d25c70daa868165e9e65f5b2;hpb=b53055f4da4f8de17c591ae07ddd782829d21cd8;p=openvswitch diff --git a/lib/classifier.c b/lib/classifier.c index 730cae84..d1f9d5dd 100644 --- a/lib/classifier.c +++ b/lib/classifier.c @@ -467,6 +467,8 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) int i; + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 1); + if (rule->priority != OFP_DEFAULT_PRIORITY) { ds_put_format(s, "priority=%d,", rule->priority); } @@ -1138,7 +1140,7 @@ flow_equal_except(const struct flow *a, const struct flow *b, const flow_wildcards_t wc = wildcards->wildcards; int i; - BUILD_ASSERT_DECL(FLOW_SIG_SIZE == 100 + FLOW_N_REGS * 4); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 1); for (i = 0; i < FLOW_N_REGS; i++) { if ((a->regs[i] ^ b->regs[i]) & wildcards->reg_masks[i]) { @@ -1182,7 +1184,7 @@ zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards) const flow_wildcards_t wc = wildcards->wildcards; int i; - BUILD_ASSERT_DECL(FLOW_SIG_SIZE == 100 + 4 * FLOW_N_REGS); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 1); for (i = 0; i < FLOW_N_REGS; i++) { flow->regs[i] &= wildcards->reg_masks[i];