X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fmeta-flow.h;h=632cb46dc080fd8f50ae49ee09064247d1dd7706;hb=d58c5bc2d854ce601338d0785c8086d619a16135;hp=91d52c7dffc8be9dbfc09d99c979c5ad467b0d5b;hpb=1b35df45f206a4649c17ca25bc5a3cc12a435052;p=openvswitch

diff --git a/lib/meta-flow.h b/lib/meta-flow.h
index 91d52c7d..632cb46d 100644
--- a/lib/meta-flow.h
+++ b/lib/meta-flow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2012 Nicira Networks.
+ * Copyright (c) 2011, 2012 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -196,6 +196,15 @@ struct mf_field {
      * NULL for the following members, respectively. */
     uint32_t nxm_header;        /* An NXM_* constant (a few fields have 0). */
     const char *nxm_name;       /* The "NXM_*" constant's name. */
+
+    /* OXM properties */
+    uint32_t oxm_header;        /* Field id in the OXM basic class,
+				 * an OXM_* constant.
+				 * Ignored if oxm_name is NULL */
+    const char *oxm_name;	/* The OXM_* constant's name,
+				 * NULL if the field is not present
+				 * in the OXM basic class */
+
 };
 
 /* The representation of a field's value. */
@@ -255,6 +264,7 @@ void mf_set_value(const struct mf_field *, const union mf_value *value,
                   struct cls_rule *);
 void mf_set_flow_value(const struct mf_field *, const union mf_value *value,
                        struct flow *);
+bool mf_is_zero(const struct mf_field *, const struct flow *);
 
 void mf_get(const struct mf_field *, const struct cls_rule *,
             union mf_value *value, union mf_value *mask);