From 85bbd7992203dba1118047f2746c7ae3f7e2d1ae Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 5 Jun 2015 22:42:10 -0700 Subject: [PATCH] ofproto: Don't report that group chaining is supported. Group chaining hasn't been supported, so we shouldn't report that it is. (This is a good demonstration of why I don't like feature bits like this. It's too easy for even well-intentioned implementers to get them wrong.) Signed-off-by: Ben Pfaff Acked-by: Alex Wang --- ofproto/ofproto.c | 3 +-- tests/ofproto.at | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index 08ba04307..a49e5a999 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -560,8 +560,7 @@ ofproto_create(const char *datapath_name, const char *datapath_type, hmap_init(&ofproto->groups); ovs_mutex_unlock(&ofproto_mutex); ofproto->ogf.types = 0xf; - ofproto->ogf.capabilities = OFPGFC_CHAINING | OFPGFC_SELECT_LIVENESS | - OFPGFC_SELECT_WEIGHT; + ofproto->ogf.capabilities = OFPGFC_SELECT_LIVENESS | OFPGFC_SELECT_WEIGHT; for (i = 0; i < 4; i++) { ofproto->ogf.max_groups[i] = OFPG_MAX; ofproto->ogf.ofpacts[i] = (UINT64_C(1) << N_OFPACTS) - 1; diff --git a/tests/ofproto.at b/tests/ofproto.at index 9c5f0bb4e..1112403ac 100644 --- a/tests/ofproto.at +++ b/tests/ofproto.at @@ -590,7 +590,7 @@ AT_CHECK([STRIP_XIDS stdout], [0], [dnl OFPST_GROUP_FEATURES reply (OF1.2): Group table: Types: 0xf - Capabilities: 0x7 + Capabilities: 0x3 all group: max_groups=0xffffff00 actions: output group set_field strip_vlan push_vlan mod_nw_ttl dec_ttl set_mpls_ttl dec_mpls_ttl push_mpls pop_mpls set_queue -- 2.20.1