From: Mahesh Bandewar <maheshb@google.com>
Date: Wed, 18 Jan 2017 23:02:55 +0000 (-0800)
Subject: macvlan: use netdev_is_rx_handler_busy instead of checking specific type
X-Git-Tag: v4.11-rc1~124^2~362^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=322dc6e067a15a17e66ce35338ca701f13c6422d;p=thirdparty%2Flinux.git

macvlan: use netdev_is_rx_handler_busy instead of checking specific type

netdev_is_rx_handler_busy() check is a superset of netif_is_ipvlan_port()
check and hence should be preferred.

Signed-off-by: Mahesh Bandewar <maheshb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 440ab3d8adf7c..cbfc1be23a0e3 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -1110,7 +1110,7 @@ static int macvlan_port_create(struct net_device *dev)
 	if (dev->type != ARPHRD_ETHER || dev->flags & IFF_LOOPBACK)
 		return -EINVAL;
 
-	if (netif_is_ipvlan_port(dev))
+	if (netdev_is_rx_handler_busy(dev))
 		return -EBUSY;
 
 	port = kzalloc(sizeof(*port), GFP_KERNEL);