diff mbox

[net-next,2/4] ipvlan: play well with macvlan device

Message ID 1417909999-13234-1-git-send-email-maheshb@google.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

If a device is already a macvlan port then refuse to use it as
an ipvlan port in the early stage of port creation.

	thost1:~# ip link add link eth0 mvl0 type macvlan
	thost1:~# echo $?
	0
	thost1:~# ip link add link eth0 ipvl0 type ipvlan
	RTNETLINK answers: Device or resource busy
	thost1:~# echo $?
	2
	thost1:~#

Signed-off-by: Mahesh Bandewar <maheshb@google.com>
---
 drivers/net/ipvlan/ipvlan_main.c | 6 ++++++
 1 file changed, 6 insertions(+)

Comments

David Miller Dec. 9, 2014, 9:10 p.m. UTC | #1
From: Mahesh Bandewar <maheshb@google.com>
Date: Sat,  6 Dec 2014 15:53:19 -0800

> If a device is already a macvlan port then refuse to use it as
> an ipvlan port in the early stage of port creation.
> 
> 	thost1:~# ip link add link eth0 mvl0 type macvlan
> 	thost1:~# echo $?
> 	0
> 	thost1:~# ip link add link eth0 ipvl0 type ipvlan
> 	RTNETLINK answers: Device or resource busy
> 	thost1:~# echo $?
> 	2
> 	thost1:~#
> 
> Signed-off-by: Mahesh Bandewar <maheshb@google.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c
index 96b71b0d78f6..a706a547d811 100644
--- a/drivers/net/ipvlan/ipvlan_main.c
+++ b/drivers/net/ipvlan/ipvlan_main.c
@@ -38,6 +38,12 @@  static int ipvlan_port_create(struct net_device *dev)
 		netdev_err(dev, "Master is either lo or non-ether device\n");
 		return -EINVAL;
 	}
+
+	if (netif_is_macvlan_port(dev)) {
+		netdev_err(dev, "Master is a macvlan port.\n");
+		return -EBUSY;
+	}
+
 	port = kzalloc(sizeof(struct ipvl_port), GFP_KERNEL);
 	if (!port)
 		return -ENOMEM;