diff options
| author | Ben Pfaff <blp@ovn.org> | 2019-04-30 09:19:27 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2019-06-20 10:26:10 -0700 |
| commit | 4332b671993180d264d076a412075c1c62f708a6 (patch) | |
| tree | 5d5f0e5310b395b31b2123bf07baa843cd8fb63f /include/openvswitch/ofp-actions.h | |
| parent | 3925b3e9afbee28a49d04752125636fedc970d13 (diff) | |
| download | openvswitch-4332b671993180d264d076a412075c1c62f708a6.tar.gz | |
ofp-actions: Support OF1.5 meter action.
OpenFlow 1.5 changed "meter" from an instruction to an action. This commit
supports it properly.
Acked-by: Numan Siddique <nusiddiq@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'include/openvswitch/ofp-actions.h')
| -rw-r--r-- | include/openvswitch/ofp-actions.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/openvswitch/ofp-actions.h b/include/openvswitch/ofp-actions.h index 436c4aadf..c8948e0d6 100644 --- a/include/openvswitch/ofp-actions.h +++ b/include/openvswitch/ofp-actions.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017 Nicira, Inc. + * Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, 2019 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -133,7 +133,7 @@ struct vl_mff_map; OFPACT(DEBUG_RECIRC, ofpact_null, ofpact, "debug_recirc") \ OFPACT(DEBUG_SLOW, ofpact_null, ofpact, "debug_slow") \ \ - /* Instructions. */ \ + /* Instructions ("meter" is an action in OF1.5+). */ \ OFPACT(METER, ofpact_meter, ofpact, "meter") \ OFPACT(CLEAR_ACTIONS, ofpact_null, ofpact, "clear_actions") \ OFPACT(WRITE_ACTIONS, ofpact_nest, actions, "write_actions") \ @@ -1360,7 +1360,7 @@ enum { const char *ovs_instruction_name_from_type(enum ovs_instruction_type type); int ovs_instruction_type_from_name(const char *name); enum ovs_instruction_type ovs_instruction_type_from_ofpact_type( - enum ofpact_type); + enum ofpact_type, enum ofp_version); enum ofperr ovs_instruction_type_from_inst_type( enum ovs_instruction_type *instruction_type, const uint16_t inst_type); |