From: Mahesh Bandewar Date: Wed, 18 Jan 2017 23:02:53 +0000 (-0800) Subject: ipvlan: use netdev_is_rx_handler_busy instead of checking specific type X-Git-Tag: MMI-PSA29.97-13-9~6152^2~362^2~1 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c3262d9deccaa7e796b0145b2d26f53c0e2d178f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ipvlan: use netdev_is_rx_handler_busy instead of checking specific type IPvlan checks if the master device is already used by checking a specific device (here it's macvlan device). This is technically not sufficient and it should just ensure the rx_handler is busy or not. This would be a super check that includes macvlan and any other that has already registered rx-handler. Signed-off-by: Mahesh Bandewar Signed-off-by: David S. Miller --- diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c index b5c390f0f2b3..95b18f4602cf 100644 --- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c @@ -102,8 +102,8 @@ static int ipvlan_port_create(struct net_device *dev) return -EINVAL; } - if (netif_is_macvlan_port(dev)) { - netdev_err(dev, "Master is a macvlan port.\n"); + if (netdev_is_rx_handler_busy(dev)) { + netdev_err(dev, "Device is already in use.\n"); return -EBUSY; }