diff options
author | Mahesh Bandewar <maheshb@google.com> | 2017-01-18 18:02:53 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-01-20 12:22:26 -0500 |
commit | c3262d9deccaa7e796b0145b2d26f53c0e2d178f (patch) | |
tree | 460a2e4d017b41c865228906957af9a2f5f86291 /drivers/net/ipvlan/ipvlan_main.c | |
parent | 1b7cd0044e4a9f69aaf00511870b07fcdeda591d (diff) |
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 <maheshb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ipvlan/ipvlan_main.c')
-rw-r--r-- | drivers/net/ipvlan/ipvlan_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
102 | return -EINVAL; | 102 | return -EINVAL; |
103 | } | 103 | } |
104 | 104 | ||
105 | if (netif_is_macvlan_port(dev)) { | 105 | if (netdev_is_rx_handler_busy(dev)) { |
106 | netdev_err(dev, "Master is a macvlan port.\n"); | 106 | netdev_err(dev, "Device is already in use.\n"); |
107 | return -EBUSY; | 107 | return -EBUSY; |
108 | } | 108 | } |
109 | 109 | ||