]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drivers: net: vxlan: drop unneeded likely() call around IS_ERR()
authorEnrico Weigelt <info@metux.net>
Wed, 5 Jun 2019 21:19:13 +0000 (23:19 +0200)
committerDavid 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

index 5994d5415a03324944472a9a875e3c1471bf5641..f31d226b5f2ad07641fe1d8a85a44091f82b6a44 100644 (file)
@@ -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);