[ovs-dev] [PATCH branch-2.3] ofproto: Don't report that group chaining is supported.

[Ben Pfaff]

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 <blp at nicira.com>
---
This is intended for branch-2.3, even though the same bug is on master,
because I'll shortly post a patch for master that adds support for
group chaining there.

 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 6c6dc2d..c3e734c 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -537,8 +537,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;
     ofproto->ogf.max_groups[OFPGT11_ALL] = OFPG_MAX;
     ofproto->ogf.max_groups[OFPGT11_SELECT] = OFPG_MAX;
     ofproto->ogf.max_groups[OFPGT11_INDIRECT] = OFPG_MAX;
diff --git a/tests/ofproto.at b/tests/ofproto.at
index 5162938..3e786ee 100644
--- a/tests/ofproto.at
+++ b/tests/ofproto.at
@@ -398,7 +398,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=0x03ff9801
     Select group :
-- 
2.1.3