From 36be51c5b09c97a62c342e8ff0bb2d1a33ea2b68 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 8 May 2015 09:15:43 -0700 Subject: [PATCH] ofp-util: Use OFPGMFC_OUT_OF_BUCKETS for indirect groups with !=1 buckets. OpenFlow 1.3 says: If a switch cannot add the incoming group entry due to restrictions (hardware or otherwise) limiting the number of group buckets, it must refuse to add the group entry and must send an ofp_error_msg with OFPET_GROUP_MOD_FAILED type and OFPGMFC_OUT_OF_BUCKETS code. This indicates that OFPGMFC_OUT_OF_BUCKETS is appropriate for an indirect group with the wrong number of buckets, but OVS was using a different error. This fixes the problem. ONF-JIRA: EXT-546 Reported-by: Mrinmoy Das Signed-off-by: Ben Pfaff Acked-by: Justin Pettit --- AUTHORS | 1 + lib/ofp-util.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 53fd835e4..891cfe976 100644 --- a/AUTHORS +++ b/AUTHORS @@ -303,6 +303,7 @@ Mike Bursell mike.bursell@citrix.com Mike Kruze mkruze@nicira.com Min Chen ustcer.tonychan@gmail.com Mikael Doverhag mdoverhag@nicira.com +Mrinmoy Das mrdas@ixiacom.com Nagi Reddy Jonnala njonnala@Brocade.com Niels van Adrichem N.L.M.vanAdrichem@tudelft.nl Niklas Andersson nandersson@nicira.com diff --git a/lib/ofp-util.c b/lib/ofp-util.c index 60cc67432..6366919a4 100644 --- a/lib/ofp-util.c +++ b/lib/ofp-util.c @@ -8375,7 +8375,7 @@ ofputil_decode_group_mod(const struct ofp_header *oh, switch (gm->type) { case OFPGT11_INDIRECT: if (!list_is_singleton(&gm->buckets)) { - return OFPERR_OFPGMFC_INVALID_GROUP; + return OFPERR_OFPGMFC_OUT_OF_BUCKETS; } break; case OFPGT11_ALL: -- 2.20.1