summaryrefslogtreecommitdiffstats
path: root/net/openvswitch
diff options
context:
space:
mode:
authorEnrico Weigelt <info@metux.net>2019-06-05 23:06:40 +0200
committerDavid S. Miller <davem@davemloft.net>2019-06-05 16:57:23 -0700
commitb90f5aa4d6268e81dd1fd51e5ef89d2892bf040d (patch)
tree81b4bee2f99ce243e855c4f45d1253eca07c4ea6 /net/openvswitch
parent4546e44ca2ec6fa3ca971ab6de3ef382f17ed544 (diff)
downloadlinux-b90f5aa4d6268e81dd1fd51e5ef89d2892bf040d.tar.gz
linux-b90f5aa4d6268e81dd1fd51e5ef89d2892bf040d.tar.bz2
linux-b90f5aa4d6268e81dd1fd51e5ef89d2892bf040d.zip
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: Enrico Weigelt <info@metux.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/openvswitch')
-rw-r--r--net/openvswitch/datapath.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index dc9ff9367221..4076e080914a 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -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,