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: <20120813160421.77a74e4e@obelix.rh> Date: Mon, 13 Aug 2012 16:04:21 -0300 From: Flavio Leitner <fbl@...hat.com> To: Jiri Pirko <jiri@...nulli.us> Cc: netdev@...r.kernel.org, davem@...emloft.net, edumazet@...gle.com, faisal.latif@...el.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, linux390@...ibm.com, shemminger@...tta.com, bhutchings@...arflare.com, therbert@...gle.com, xiyou.wangcong@...il.com, joe@...ches.com, gregory.v.rose@...el.com, john.r.fastabend@...el.com, linux-rdma@...r.kernel.org, linux-kernel@...r.kernel.org, linux-s390@...r.kernel.org, bridge@...ts.linux-foundation.org Subject: Re: [patch net-next 03/16] vlan: add link to upper device On Mon, 13 Aug 2012 17:27:02 +0200 Jiri Pirko <jiri@...nulli.us> wrote: > Signed-off-by: Jiri Pirko <jiri@...nulli.us> > --- > net/8021q/vlan.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c > index 9096bcb..739665e 100644 > --- a/net/8021q/vlan.c > +++ b/net/8021q/vlan.c > @@ -105,6 +105,8 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head) > */ > unregister_netdevice_queue(dev, head); > > + netdev_upper_dev_unlink(real_dev, dev); > + > if (grp->nr_vlan_devs == 0) > vlan_gvrp_uninit_applicant(real_dev); > > @@ -162,9 +164,13 @@ int register_vlan_dev(struct net_device *dev) > if (err < 0) > goto out_uninit_applicant; > > + err = netdev_upper_dev_link(real_dev, dev); > + if (err) > + goto out_uninit_applicant; > + > err = register_netdevice(dev); > if (err < 0) > - goto out_uninit_applicant; > + goto out_upper_dev_unlink; ^^^^^^^^^^^^^^^^^^^^^^^^^^^ see below: > > /* Account for reference in struct vlan_dev_priv */ > dev_hold(real_dev); > @@ -180,6 +186,8 @@ int register_vlan_dev(struct net_device *dev) > > return 0; > > +upper_dev_unlink: ^^^^^^^^^^^^^^^^^^^ should be out_upper_dev_unlink: fbl > + netdev_upper_dev_unlink(real_dev, dev); > out_uninit_applicant: > if (grp->nr_vlan_devs == 0) > vlan_gvrp_uninit_applicant(real_dev); -- 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