From: Jarno Rajahalme <jrajahalme@nicira.com>
Date: Fri, 13 Sep 2013 22:03:30 +0000 (-0700)
Subject: ofproto: Actually return the error code from meter add.
X-Git-Tag: sliver-openvswitch-2.0.90-1~13^2~39
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f0f8c6c221a890d0dc9476f9c76081afbc6c9392;p=sliver-openvswitch.git

ofproto: Actually return the error code from meter add.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 112790040..9a2a4e88a 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -4920,7 +4920,7 @@ handle_add_meter(struct ofproto *ofproto, struct ofputil_meter_mod *mm)
         ovs_assert(provider_meter_id.uint32 != UINT32_MAX);
         *meterp = meter_create(&mm->meter, provider_meter_id);
     }
-    return 0;
+    return error;
 }
 
 static enum ofperr