Define NXAST_ACTION instead of listing all OFPUTIL_NXAST_xxx.

Signed-off-by: Isaku Yamahata <yamah...@valinux.co.jp>
---
 lib/ofp-actions.c |   45 +++++----------------------------------------
 1 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
index d527dcd..ba9e61c 100644
--- a/lib/ofp-actions.c
+++ b/lib/ofp-actions.c
@@ -403,26 +403,9 @@ ofpact_from_openflow10(const union ofp_action *a, struct 
ofpbuf *out)
                                         out);
         break;
 
-    case OFPUTIL_NXAST_RESUBMIT:
-    case OFPUTIL_NXAST_SET_TUNNEL:
-    case OFPUTIL_NXAST_SET_QUEUE:
-    case OFPUTIL_NXAST_POP_QUEUE:
-    case OFPUTIL_NXAST_REG_MOVE:
-    case OFPUTIL_NXAST_REG_LOAD:
-    case OFPUTIL_NXAST_NOTE:
-    case OFPUTIL_NXAST_SET_TUNNEL64:
-    case OFPUTIL_NXAST_MULTIPATH:
-    case OFPUTIL_NXAST_AUTOPATH:
-    case OFPUTIL_NXAST_BUNDLE:
-    case OFPUTIL_NXAST_BUNDLE_LOAD:
-    case OFPUTIL_NXAST_OUTPUT_REG:
-    case OFPUTIL_NXAST_RESUBMIT_TABLE:
-    case OFPUTIL_NXAST_LEARN:
-    case OFPUTIL_NXAST_EXIT:
-    case OFPUTIL_NXAST_DEC_TTL:
-    case OFPUTIL_NXAST_FIN_TIMEOUT:
-    case OFPUTIL_NXAST_CONTROLLER:
-        return ofpact_from_nxast(a, code, out);
+#define NXAST_ACTION(ENUM, STRUCT, EXTENSIBLE, NAME) case OFPUTIL_##ENUM:
+#include "ofp-util.def"
+       return ofpact_from_nxast(a, code, out);
     }
 
     return error;
@@ -646,28 +629,10 @@ ofpact_from_openflow11(const union ofp_action *a, struct 
ofpbuf *out)
 
     case OFPUTIL_OFPAT11_SET_TP_DST:
         ofpact_put_SET_L4_DST_PORT(out)->port = ntohs(a->tp_port.tp_port);
-
         break;
 
-    case OFPUTIL_NXAST_RESUBMIT:
-    case OFPUTIL_NXAST_SET_TUNNEL:
-    case OFPUTIL_NXAST_SET_QUEUE:
-    case OFPUTIL_NXAST_POP_QUEUE:
-    case OFPUTIL_NXAST_REG_MOVE:
-    case OFPUTIL_NXAST_REG_LOAD:
-    case OFPUTIL_NXAST_NOTE:
-    case OFPUTIL_NXAST_SET_TUNNEL64:
-    case OFPUTIL_NXAST_MULTIPATH:
-    case OFPUTIL_NXAST_AUTOPATH:
-    case OFPUTIL_NXAST_BUNDLE:
-    case OFPUTIL_NXAST_BUNDLE_LOAD:
-    case OFPUTIL_NXAST_OUTPUT_REG:
-    case OFPUTIL_NXAST_RESUBMIT_TABLE:
-    case OFPUTIL_NXAST_LEARN:
-    case OFPUTIL_NXAST_EXIT:
-    case OFPUTIL_NXAST_DEC_TTL:
-    case OFPUTIL_NXAST_FIN_TIMEOUT:
-    case OFPUTIL_NXAST_CONTROLLER:
+#define NXAST_ACTION(ENUM, STRUCT, EXTENSIBLE, NAME) case OFPUTIL_##ENUM:
+#include "ofp-util.def"
         return ofpact_from_nxast(a, code, out);
     }
 
-- 
1.7.1.1

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

Reply via email to