[ovs-dev] [PATCH net-next v2 3/5] net: openvswitch: remove the unnecessary check
xiangxia.m.yue at gmail.com
xiangxia.m.yue at gmail.com
Thu Apr 16 10:17:01 UTC 2020
From: Tonghao Zhang <xiangxia.m.yue at gmail.com>
Before calling the ovs_meter_cmd_reply_stats, "meter"
is checked, so don't check it agin in that function.
Cc: Pravin B Shelar <pshelar at ovn.org>
Cc: Andy Zhou <azhou at ovn.org>
Signed-off-by: Tonghao Zhang <xiangxia.m.yue at gmail.com>
---
net/openvswitch/meter.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c
index 1b6776f9c109..f552c64ae8df 100644
--- a/net/openvswitch/meter.c
+++ b/net/openvswitch/meter.c
@@ -229,12 +229,11 @@ static int ovs_meter_cmd_reply_stats(struct sk_buff *reply, u32 meter_id,
if (nla_put_u32(reply, OVS_METER_ATTR_ID, meter_id))
goto error;
- if (!meter)
- return 0;
-
if (nla_put(reply, OVS_METER_ATTR_STATS,
- sizeof(struct ovs_flow_stats), &meter->stats) ||
- nla_put_u64_64bit(reply, OVS_METER_ATTR_USED, meter->used,
+ sizeof(struct ovs_flow_stats), &meter->stats))
+ goto error;
+
+ if (nla_put_u64_64bit(reply, OVS_METER_ATTR_USED, meter->used,
OVS_METER_ATTR_PAD))
goto error;
--
2.23.0
More information about the dev
mailing list