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 v5 net-next 24/27] vlan: link the upper neighbour only after registering
Date: Wed, 25 Sep 2013 09:20:29 +0200 [thread overview]
Message-ID: <1380093632-1842-25-git-send-email-vfalico@redhat.com> (raw)
In-Reply-To: <1380093632-1842-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>
---
Notes:
v4 -> v5
No change.
v3 -> v4:
No change.
v2 -> v3:
No change.
v1 -> v2:
No changes.
RFC -> v1:
No changes.
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-25 7:21 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-25 7:20 [PATCH v5 net-next 00/27] bonding: use neighbours instead of own lists Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 01/27] net: use lists as arguments instead of bool upper Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 02/27] net: add adj_list to save only neighbours Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 03/27] net: add RCU variant to search for netdev_adjacent link Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 04/27] net: add netdev_adjacent->private and allow to use it Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 05/27] bonding: populate neighbour's private on enslave Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 06/27] bonding: modify bond_get_slave_by_dev() to use neighbours Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 07/27] net: add for_each iterators through neighbour lower link's private Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 08/27] bonding: remove bond_for_each_slave_continue_reverse() Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 09/27] bonding: make bond_for_each_slave() use lower neighbour's private Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 10/27] bonding: use bond_for_each_slave() in bond_uninit() Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 11/27] bonding: rework bond_3ad_xmit_xor() to use bond_for_each_slave() only Veaceslav Falico
2013-09-26 2:31 ` Ding Tianhong
2013-09-26 5:43 ` Veaceslav Falico
2013-09-26 6:39 ` Ding Tianhong
2013-09-25 7:20 ` [PATCH v5 net-next 12/27] bonding: rework rlb_next_rx_slave() to use bond_for_each_slave() Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 13/27] bonding: rework bond_find_best_slave() " Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 14/27] bonding: rework bond_ab_arp_probe() " Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 15/27] bonding: remove unused bond_for_each_slave_from() Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 16/27] bonding: add bond_has_slaves() and use it Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 17/27] bonding: convert bond_has_slaves() to use the neighbour list Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 18/27] net: add a possibility to get private from netdev_adjacent->list Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 19/27] bonding: convert first/last slave logic to use neighbours Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 20/27] bonding: remove bond_prev_slave() Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 21/27] bonding: add __bond_next_slave() which uses neighbours Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 22/27] bonding: use neighbours for bond_next_slave() Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 23/27] bonding: remove slave lists Veaceslav Falico
2013-09-25 7:20 ` Veaceslav Falico [this message]
2013-09-25 7:20 ` [PATCH v5 net-next 25/27] vlan: unlink the upper neighbour before unregistering Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 26/27] net: expose the master link to sysfs, and remove it from bond Veaceslav Falico
2013-09-25 7:20 ` [PATCH v5 net-next 27/27] net: create sysfs symlinks for neighbour devices Veaceslav Falico
2013-09-26 20:02 ` [PATCH v5 net-next 00/27] bonding: use neighbours instead of own lists David Miller
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=1380093632-1842-25-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).