[ovs-dev] [PATCH 2/3] [RFC] Rename mf_fields as nxm_mf_fields

[Simon Horman]

This is to provide symetry with oxm_mf_fields which will be added
to hold the fields for OXM which is part of Open Flow 1.2

Signed-off-by: Simon Horman <ho...@verge.net.au>
---
 lib/meta-flow.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/meta-flow.c b/lib/meta-flow.c
index 84ba88b..d4a7072 100644
--- a/lib/meta-flow.c
+++ b/lib/meta-flow.c
@@ -41,7 +41,7 @@ VLOG_DEFINE_THIS_MODULE(meta_flow);
     sizeof ((union mf_value *)0)->MEMBER,       \
     8 * sizeof ((union mf_value *)0)->MEMBER
 
-static const struct mf_field mf_fields[MFF_N_IDS] = {
+static const struct mf_field nxm_mf_fields[MFF_N_IDS] = {
     /* ## -------- ## */
     /* ## metadata ## */
     /* ## -------- ## */
@@ -416,7 +416,7 @@ const struct mf_field *
 mf_from_id(enum mf_field_id id)
 {
     assert((unsigned int) id < MFF_N_IDS);
-    return &mf_fields[id];
+    return &nxm_mf_fields[id];
 }
 
 /* Returns the field with the given 'name', or a null pointer if no field has
@@ -429,7 +429,7 @@ mf_from_name(const char *name)
     if (shash_is_empty(&mf_by_name)) {
         const struct mf_field *mf;
 
-        for (mf = mf_fields; mf < &mf_fields[MFF_N_IDS]; mf++) {
+        for (mf = nxm_mf_fields; mf < &nxm_mf_fields[MFF_N_IDS]; mf++) {
             shash_add_once(&mf_by_name, mf->name, mf);
             if (mf->extra_name) {
                 shash_add_once(&mf_by_name, mf->extra_name, mf);
@@ -456,7 +456,7 @@ nxm_init(void)
 {
     const struct mf_field *mf;
 
-    for (mf = mf_fields; mf < &mf_fields[MFF_N_IDS]; mf++) {
+    for (mf = nxm_mf_fields; mf < &nxm_mf_fields[MFF_N_IDS]; mf++) {
         if (mf->nxm_header) {
             add_nxm_field(mf->nxm_header, mf);
             if (mf->maskable != MFM_NONE) {
@@ -467,7 +467,7 @@ nxm_init(void)
 
 #ifndef NDEBUG
     /* Verify that the header values are unique. */
-    for (mf = mf_fields; mf < &mf_fields[MFF_N_IDS]; mf++) {
+    for (mf = nxm_mf_fields; mf < &nxm_mf_fields[MFF_N_IDS]; mf++) {
         if (mf->nxm_header) {
             assert(mf_from_nxm_header(mf->nxm_header) == mf);
             if (mf->maskable != MFM_NONE) {
-- 
1.7.9.5

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev