Commit 88e235b8 authored by Enrico Weigelt's avatar Enrico Weigelt Committed by David S. Miller

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

IS_ERR() already calls unlikely(), so this extra unlikely() call
around 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 b90f5aa4
...@@ -1341,7 +1341,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg, ...@@ -1341,7 +1341,7 @@ struct fib_info *fib_create_info(struct fib_config *cfg,
goto failure; goto failure;
fi->fib_metrics = ip_fib_metrics_init(fi->fib_net, cfg->fc_mx, fi->fib_metrics = ip_fib_metrics_init(fi->fib_net, cfg->fc_mx,
cfg->fc_mx_len, extack); cfg->fc_mx_len, extack);
if (unlikely(IS_ERR(fi->fib_metrics))) { if (IS_ERR(fi->fib_metrics)) {
err = PTR_ERR(fi->fib_metrics); err = PTR_ERR(fi->fib_metrics);
kfree(fi); kfree(fi);
return ERR_PTR(err); return ERR_PTR(err);
......
...@@ -320,7 +320,7 @@ struct sock *__inet_lookup_listener(struct net *net, ...@@ -320,7 +320,7 @@ struct sock *__inet_lookup_listener(struct net *net,
saddr, sport, htonl(INADDR_ANY), hnum, saddr, sport, htonl(INADDR_ANY), hnum,
dif, sdif); dif, sdif);
done: done:
if (unlikely(IS_ERR(result))) if (IS_ERR(result))
return NULL; return NULL;
return result; return result;
} }
......
...@@ -483,7 +483,7 @@ struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr, ...@@ -483,7 +483,7 @@ struct sock *__udp4_lib_lookup(struct net *net, __be32 saddr,
htonl(INADDR_ANY), hnum, dif, sdif, htonl(INADDR_ANY), hnum, dif, sdif,
exact_dif, hslot2, skb); exact_dif, hslot2, skb);
} }
if (unlikely(IS_ERR(result))) if (IS_ERR(result))
return NULL; return NULL;
return result; return result;
} }
......
...@@ -212,7 +212,7 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb, ...@@ -212,7 +212,7 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,
gso_skb->destructor = NULL; gso_skb->destructor = NULL;
segs = skb_segment(gso_skb, features); segs = skb_segment(gso_skb, features);
if (unlikely(IS_ERR_OR_NULL(segs))) { if (IS_ERR_OR_NULL(segs)) {
if (copy_dtor) if (copy_dtor)
gso_skb->destructor = sock_wfree; gso_skb->destructor = sock_wfree;
return segs; return segs;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment