projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
26f8113
)
drivers: net: vxlan: drop unneeded likely() call around IS_ERR()
author
Enrico Weigelt
<info@metux.net>
Wed, 5 Jun 2019 21:19:13 +0000
(23:19 +0200)
committer
David S. Miller
<davem@davemloft.net>
Wed, 5 Jun 2019 23:57:23 +0000
(16:57 -0700)
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>
drivers/net/vxlan.c
patch
|
blob
|
history
diff --git
a/drivers/net/vxlan.c
b/drivers/net/vxlan.c
index
5994d54
..
f31d226
100644
(file)
--- a/
drivers/net/vxlan.c
+++ b/
drivers/net/vxlan.c
@@
-2222,7
+2222,7
@@
static struct rtable *vxlan_get_route(struct vxlan_dev *vxlan, struct net_device
fl4.fl4_sport = sport;
rt = ip_route_output_key(vxlan->net, &fl4);
- if (
likely(!IS_ERR(rt)
)) {
+ if (
!IS_ERR(rt
)) {
if (rt->dst.dev == dev) {
netdev_dbg(dev, "circular route to %pI4\n", &daddr);
ip_rt_put(rt);