From: Veaceslav Falico <vfalico@redhat.com>
To: netdev@vger.kernel.org
Cc: jiri@resnulli.us, Veaceslav Falico <vfalico@redhat.com>,
Patrick McHardy <kaber@trash.net>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH net-next 25/26] vlan: link the upper neighbour only after registering
Date: Mon, 9 Sep 2013 22:16:43 +0200 [thread overview]
Message-ID: <1378757804-3159-26-git-send-email-vfalico@redhat.com> (raw)
In-Reply-To: <1378757804-3159-1-git-send-email-vfalico@redhat.com>
Otherwise users might access it without being fully registered, as per
sysfs - it only inits in register_netdevice(), so is unusable till it is
called.
CC: Patrick McHardy <kaber@trash.net>
CC: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Veaceslav Falico <vfalico@redhat.com>
---
net/8021q/vlan.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 61fc573..69b4a35 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -169,13 +169,13 @@ int register_vlan_dev(struct net_device *dev)
if (err < 0)
goto out_uninit_mvrp;
- err = netdev_upper_dev_link(real_dev, dev);
- if (err)
- goto out_uninit_mvrp;
-
err = register_netdevice(dev);
if (err < 0)
- goto out_upper_dev_unlink;
+ goto out_uninit_mvrp;
+
+ err = netdev_upper_dev_link(real_dev, dev);
+ if (err)
+ goto out_unregister_netdev;
/* Account for reference in struct vlan_dev_priv */
dev_hold(real_dev);
@@ -191,8 +191,8 @@ int register_vlan_dev(struct net_device *dev)
return 0;
-out_upper_dev_unlink:
- netdev_upper_dev_unlink(real_dev, dev);
+out_unregister_netdev:
+ unregister_netdevice(dev);
out_uninit_mvrp:
if (grp->nr_vlan_devs == 0)
vlan_mvrp_uninit_applicant(real_dev);
--
1.8.4
next prev parent reply other threads:[~2013-09-09 20:17 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-09 20:16 [PATCH net-next 0/26] bonding: use neighbours instead of own lists Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 01/26] net: add adj_list to save only neighbours Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 02/26] net: add RCU variant to search for netdev_adjacent link Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 03/26] net: uninline netdev neighbour functions Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 04/26] net: add netdev_adjacent->private and allow to use it Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 05/26] bonding: populate neighbour's private on enslave Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 06/26] bonding: modify bond_get_slave_by_dev() to use neighbours Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 07/26] net: add for_each iterators through neighbour lower link's private Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 08/26] bonding: remove bond_for_each_slave_reverse() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 09/26] bonding: make bond_for_each_slave() use lower neighbour's private Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 10/26] bonding: use bond_for_each_slave() in bond_uninit() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 11/26] bonding: rework bond_3ad_xmit_xor() to use bond_for_each_slave() only Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 12/26] bonding: rework rlb_next_rx_slave() to use bond_for_each_slave() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 13/26] bonding: rework bond_find_best_slave() " Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 14/26] bonding: rework bond_ab_arp_probe() " Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 15/26] bonding: remove unused bond_for_each_slave_from() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 16/26] bonding: add bond_has_slaves() and use it Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 17/26] bonding: convert bond_has_slaves() to use the neighbour list Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 18/26] net: add a possibility to get private from netdev_adjacent->list Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 19/26] bonding: convert first/last slave logic to use neighbours Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 20/26] bonding: remove bond_prev_slave() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 21/26] net: add a function to get the next private Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 22/26] bonding: use neighbours for bond_next_slave() Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 23/26] bonding: remove slave lists Veaceslav Falico
2013-09-09 20:16 ` [PATCH net-next 24/26] net: expose the master link to sysfs, and remove it from bond Veaceslav Falico
2013-09-09 20:16 ` Veaceslav Falico [this message]
2013-09-09 20:16 ` [PATCH net-next 26/26] net: create sysfs symlinks for neighbour devices Veaceslav Falico
2013-09-10 11:08 ` [PATCH net-next 0/26] bonding: use neighbours instead of own lists Ding Tianhong
2013-09-10 16:41 ` Veaceslav Falico
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1378757804-3159-26-git-send-email-vfalico@redhat.com \
--to=vfalico@redhat.com \
--cc=davem@davemloft.net \
--cc=jiri@resnulli.us \
--cc=kaber@trash.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).