Message ID | 1587575340-6790-4-git-send-email-xiangxia.m.yue@gmail.com |
---|---|
State | Superseded |
Headers | show |
Series | expand meter tables and fix bug | expand |
On Wed, Apr 22, 2020 at 10:10 AM <xiangxia.m.yue@gmail.com> wrote: > > From: Tonghao Zhang <xiangxia.m.yue@gmail.com> > > Before invoking the ovs_meter_cmd_reply_stats, "meter" > was checked, so don't check it agin in that function. > > Cc: Pravin B Shelar <pshelar@ovn.org> > Cc: Andy Zhou <azhou@ovn.org> > Signed-off-by: Tonghao Zhang <xiangxia.m.yue@gmail.com> > --- > net/openvswitch/meter.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > Acked-by: Pravin B Shelar <pshelar@ovn.org> Thanks.
diff --git a/net/openvswitch/meter.c b/net/openvswitch/meter.c index 372f4565872d..b7893b0d6423 100644 --- a/net/openvswitch/meter.c +++ b/net/openvswitch/meter.c @@ -242,12 +242,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;