Commit a8e38738 authored by Tonghao Zhang's avatar Tonghao Zhang Committed by David S. Miller
Browse files

net: openvswitch: remove the unnecessary check 



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: default avatarTonghao Zhang <xiangxia.m.yue@gmail.com>
Acked-by: default avatarPravin B Shelar <pshelar@ovn.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent eb58eebc

net/openvswitch/meter.c

+4 −5
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE