ofp-errors: Remove OFPERR_NXFMFC_GROUPS_NOT_SUPPORTED

OFPERR_NXFMFC_GROUPS_NOT_SUPPORTED is currently only used in paths which
are part of a non-NX extension portions of the Open Flow 1.1+
implementation.

After recent discussion it has been decided to attempt to only use
standardised, albeit lest-specify, errors unless errors arise from use of
an NX extension.

With the above in mind it seems appropriate to:
* Use OFPERR_OFPFMFC_UNKNOWN in place of OFPERR_NXFMFC_GROUPS_NOT_SUPPORTED.
* Remove OFPERR_NXFMFC_GROUPS_NOT_SUPPORTED as it is no longer used.

An unfortunate side-effect of this change is that the error for
the case in question is now less-specific.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/lib/ofp-errors.h b/lib/ofp-errors.h
index 4d17ba95a3dfdd49ba336b311049f4feb2cef8b4..69ada40eb5694c2ebbf61004dfd56cf7fc500aca 100644 (file)
--- a/lib/ofp-errors.h
+++ b/lib/ofp-errors.h
@@ -337,9 +337,6 @@ enum ofperr {
      * extension is enabled. */
     OFPERR_NXFMFC_BAD_TABLE_ID,
 
-    /* NX1.0+(3,258).  'out_group' specified but groups not yet supported. */
-    OFPERR_NXFMFC_GROUPS_NOT_SUPPORTED,
-
 /* ## ---------------------- ## */
 /* ## OFPET_GROUP_MOD_FAILED ## */
 /* ## ---------------------- ## */

diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index 6622b833d4072e2b287e45f3ba046f5dd3446497..11781b6ff37761b7e61bdd5e2453fbd11861204e 100644 (file)
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -1171,7 +1171,7 @@ ofputil_decode_flow_mod(struct ofputil_flow_mod *fm,
             return error;
         }
         if (ofm->out_group != htonl(OFPG_ANY)) {
-            return OFPERR_NXFMFC_GROUPS_NOT_SUPPORTED;
+            return OFPERR_OFPFMFC_UNKNOWN;
         }
         fm->flags = ntohs(ofm->flags);
     } else {
@@ -1410,7 +1410,7 @@ ofputil_decode_ofpst11_flow_request(struct ofputil_flow_stats_request *fsr,
         return error;
     }
     if (ofsr->out_group != htonl(OFPG11_ANY)) {
-        return OFPERR_NXFMFC_GROUPS_NOT_SUPPORTED;
+        return OFPERR_OFPFMFC_UNKNOWN;
     }
     fsr->cookie = ofsr->cookie;
     fsr->cookie_mask = ofsr->cookie_mask;