| Message ID | 20181121050835.23589-1-tony.vanderpeet@alliedtelesis.co.nz |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [ovs-dev] ofproto: Return correct error codes from meter_set. | expand |
Bleep bloop. Greetings Tony van der Peet, I am a robot and I have tried out your patch.
Thanks for your contribution.
I encountered some error that I wasn't expecting. See the details below.
checkpatch:
WARNING: Line is 88 characters long (recommended limit is 79)
#24 FILE: ofproto/ofproto-dpif.c:5943:
return OFPERR_OFPMMFC_OUT_OF_METERS; /* Datapath does not support meter. */
WARNING: Line is 81 characters long (recommended limit is 79)
#29 FILE: ofproto/ofproto-dpif.c:5947:
return OFPERR_OFPMMFC_OUT_OF_METERS; /* Can't allocate a DP meter. */
Lines checked: 36, Warnings: 2, Errors: 0
Please check this out. If you feel there has been an error, please email aconole@bytheb.org
Thanks,
0-day Robot
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index b7acfa246..40fbbf98d 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -5940,11 +5940,11 @@ meter_set(struct ofproto *ofproto_, ofproto_meter_id *meter_id, /* Provider ID unknown. Use backer to allocate a new DP meter */ if (meter_id->uint32 == UINT32_MAX) { if (!ofproto->backer->meter_ids) { - return EFBIG; /* Datapath does not support meter. */ + return OFPERR_OFPMMFC_OUT_OF_METERS; /* Datapath does not support meter. */ } if(!id_pool_alloc_id(ofproto->backer->meter_ids, &meter_id->uint32)) { - return ENOMEM; /* Can't allocate a DP meter. */ + return OFPERR_OFPMMFC_OUT_OF_METERS; /* Can't allocate a DP meter. */ } }
This routine should return enum ofperr, but in a couple of places doesn't. When adding one more meter when meter table is full, this has the result of generating an incorrect error message. Signed-off-by: Tony van der Peet <tony.vanderpeet@alliedtelesis.co.nz> --- ofproto/ofproto-dpif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)