Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cd43db7 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

macvlan: add link to upper device 



Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ff162a8

drivers/net/macvlan.c

+8 −1
Original line number Diff line number Diff line
@@ -764,16 +764,22 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev, 
		memcpy(dev->dev_addr, lowerdev->dev_addr, ETH_ALEN);

	}



	err = netdev_upper_dev_link(lowerdev, dev);

	if (err)

		goto destroy_port;



	port->count += 1;

	err = register_netdevice(dev);

	if (err < 0)

		goto destroy_port;

		goto upper_dev_unlink;



	list_add_tail(&vlan->list, &port->vlans);

	netif_stacked_transfer_operstate(lowerdev, dev);



	return 0;



upper_dev_unlink:

	netdev_upper_dev_unlink(lowerdev, dev);

destroy_port:

	port->count -= 1;

	if (!port->count)
@@ -797,6 +803,7 @@ void macvlan_dellink(struct net_device *dev, struct list_head *head) 


	list_del(&vlan->list);

	unregister_netdevice_queue(dev, head);

	netdev_upper_dev_unlink(vlan->lowerdev, dev);

}

EXPORT_SYMBOL_GPL(macvlan_dellink);