do not report OF1.1 bits (set_dl_src etc) as group features is OF1.2+.
Signed-off-by: YAMAMOTO Takashi <[email protected]>
---
ofproto/ofproto.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index b88cd81..28b21ce 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -538,9 +538,24 @@ ofproto_create(const char *datapath_name, const char
*datapath_type,
ofproto->ogf.max_groups[OFPGT11_INDIRECT] = OFPG_MAX;
ofproto->ogf.max_groups[OFPGT11_FF] = OFPG_MAX;
ofproto->ogf.actions[0] =
-#define OFPAT11_ACTION(ENUM, STRUCT, EXTENSIBLE, NAME) (1 << ENUM) |
-#include "ofp-util.def"
- 0;
+ (1 << OFPAT11_OUTPUT) |
+ (1 << OFPAT11_COPY_TTL_OUT) |
+ (1 << OFPAT11_COPY_TTL_IN) |
+ (1 << OFPAT11_SET_MPLS_TTL) |
+ (1 << OFPAT11_DEC_MPLS_TTL) |
+ (1 << OFPAT11_PUSH_VLAN) |
+ (1 << OFPAT11_POP_VLAN) |
+ (1 << OFPAT11_PUSH_MPLS) |
+ (1 << OFPAT11_POP_MPLS) |
+ (1 << OFPAT11_SET_QUEUE) |
+ (1 << OFPAT11_GROUP) |
+ (1 << OFPAT11_SET_NW_TTL) |
+ (1 << OFPAT11_DEC_NW_TTL) |
+ (1 << OFPAT12_SET_FIELD) |
+/* not supported:
+ * (1 << OFPAT13_PUSH_PBB) |
+ * (1 << OFPAT13_POP_PBB) | */
+ (1 << OFPAT11_EXPERIMENTER);
error = ofproto->ofproto_class->construct(ofproto);
if (error) {
--
1.8.3.1
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
