Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b90f5aa4 authored by Enrico Weigelt's avatar Enrico Weigelt Committed by David S. Miller
Browse files

net: openvswitch: drop unneeded likely() call around IS_ERR() 



IS_ERR() already calls unlikely(), so this extra likely() call
around the !IS_ERR() is not needed.

Signed-off-by: default avatarEnrico Weigelt <info@metux.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4546e44c

net/openvswitch/datapath.c

+1 −1
Original line number Diff line number Diff line
@@ -1347,7 +1347,7 @@ static int ovs_flow_cmd_del(struct sk_buff *skb, struct genl_info *info) 
	reply = ovs_flow_cmd_alloc_info((const struct sw_flow_actions __force *) flow->sf_acts,

					&flow->id, info, false, ufid_flags);

	if (likely(reply)) {

		if (likely(!IS_ERR(reply))) {

		if (!IS_ERR(reply)) {

			rcu_read_lock();	/*To keep RCU checker happy. */

			err = ovs_flow_cmd_fill_info(flow, ovs_header->dp_ifindex,

						     reply, info->snd_portid,