lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1356868702-8144-3-git-send-email-jiri@resnulli.us> Date: Sun, 30 Dec 2012 12:58:09 +0100 From: Jiri Pirko <jiri@...nulli.us> To: netdev@...r.kernel.org Cc: davem@...emloft.net, edumazet@...gle.com, bhutchings@...arflare.com, faisal.latif@...el.com, shemminger@...tta.com, fbl@...hat.com, roland@...nel.org, sean.hefty@...el.com, hal.rosenstock@...il.com, fubar@...ibm.com, andy@...yhouse.net, divy@...lsio.com, jitendra.kalsaria@...gic.com, sony.chacko@...gic.com, linux-driver@...gic.com, kaber@...sh.net, ursula.braun@...ibm.com, blaschka@...ux.vnet.ibm.com, schwidefsky@...ibm.com, heiko.carstens@...ibm.com, ebiederm@...ssion.com, joe@...ches.com, amwang@...hat.com, nhorman@...driver.com, john.r.fastabend@...el.com, pablo@...filter.org Subject: [patch net-next 02/15] macvlan: add link to upper device Signed-off-by: Jiri Pirko <jiri@...nulli.us> --- drivers/net/macvlan.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 68a43fe..b7b614f 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -765,16 +765,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) @@ -798,6 +804,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); -- 1.8.0 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists