diff options
| author | Tony van der Peet <tony.vanderpeet@alliedtelesis.co.nz> | 2018-11-22 09:44:43 +1300 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2018-12-12 08:45:52 -0800 |
| commit | 2220548113d054439afc626d2a606ed27e3b7176 (patch) | |
| tree | 52cd428a940771e3da35c997d1db6164c9fe62ac /ofproto | |
| parent | cd5b89a5a99c3ead973b168326eaef47d4e4c077 (diff) | |
| download | openvswitch-2220548113d054439afc626d2a606ed27e3b7176.tar.gz | |
ofproto: Return correct error codes from meter_set.
This routine should return enum ofperr, but in a couple of places
doesn't. When adding one more meter when the meter table is full,
this results in an incorrect error message.
Signed-off-by: Tony van der Peet <tony.vanderpeet@alliedtelesis.co.nz>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'ofproto')
| -rw-r--r-- | ofproto/ofproto-dpif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index b7acfa246..2dc5778e1 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; /* Meters not supported. */ } 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 meter. */ } } |