]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: openvswitch: remove the unnecessary check
authorTonghao Zhang <xiangxia.m.yue@gmail.com>
Fri, 24 Apr 2020 00:08:04 +0000 (08:08 +0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Apr 2020 01:26:11 +0000 (18:26 -0700)
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>
Acked-by: Pravin B Shelar <pshelar@ovn.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/openvswitch/meter.c

index 372f4565872ddc62dd6c7f82e3cfceca8a254b2a..b7893b0d6423a524f19101b75e3ea0c6e5af1ffb 100644 (file)
@@ -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;