From: Jiri Pirko <jiri@resnulli•us>
To: netdev@vger•kernel.org
Cc: davem@davemloft•net, edumazet@google•com,
bhutchings@solarflare•com, faisal.latif@intel•com,
shemminger@vyatta•com, fbl@redhat•com, roland@kernel•org,
sean.hefty@intel•com, hal.rosenstock@gmail•com, fubar@us•ibm.com,
andy@greyhouse•net, divy@chelsio•com,
jitendra.kalsaria@qlogic•com, sony.chacko@qlogic•com,
linux-driver@qlogic•com, kaber@trash•net,
ursula.braun@de•ibm.com, blaschka@linux•vnet.ibm.com,
schwidefsky@de•ibm.com, heiko.carstens@de•ibm.com,
ebiederm@xmission•com, joe@perches•com, amwang@redhat•com,
nhorman@tuxdriver•com, john.r.fastabend@intel•com,
pablo@netfilter•org
Subject: [patch net-next 02/15] macvlan: add link to upper device
Date: Sat, 29 Dec 2012 11:38:29 +0100 [thread overview]
Message-ID: <1356777522-19652-3-git-send-email-jiri@resnulli.us> (raw)
In-Reply-To: <1356777522-19652-1-git-send-email-jiri@resnulli.us>
Signed-off-by: Jiri Pirko <jiri@resnulli•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
next prev parent reply other threads:[~2012-12-29 10:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-29 10:38 [patch net-next V3 00/15] net: introduce upper device lists and remove dev->master Jiri Pirko
2012-12-29 10:38 ` [patch net-next 01/15] net: introduce upper device lists Jiri Pirko
2012-12-29 23:31 ` David Miller
2012-12-30 9:53 ` Jiri Pirko
2012-12-29 10:38 ` Jiri Pirko [this message]
2012-12-29 10:38 ` [patch net-next 03/15] vlan: add link to upper device Jiri Pirko
2012-12-29 10:38 ` [patch net-next 04/15] rtnetlink: remove usage of dev->master Jiri Pirko
2012-12-29 10:38 ` [patch net-next 05/15] team: remove usage of netdev_set_master() Jiri Pirko
2012-12-29 10:38 ` [patch net-next 06/15] bridge: " Jiri Pirko
2012-12-29 10:38 ` [patch net-next 07/15] netpoll: remove usage of dev->master Jiri Pirko
2012-12-29 10:38 ` [patch net-next 08/15] cxgb3: " Jiri Pirko
2012-12-29 10:38 ` [patch net-next 09/15] qlcnic: guard __vlan_find_dev_deep() by rcu_read_lock Jiri Pirko
2012-12-29 10:38 ` [patch net-next 10/15] qeth: ensure that __vlan_find_dev_deep() is called with rcu_read_lock Jiri Pirko
2012-12-29 10:38 ` [patch net-next 11/15] vlan: remove usage of dev->master in __vlan_find_dev_deep() Jiri Pirko
2012-12-29 10:38 ` [patch net-next 12/15] nes: remove usage of dev->master Jiri Pirko
2012-12-29 10:38 ` [patch net-next 13/15] bonding: " Jiri Pirko
2012-12-29 10:38 ` [patch net-next 14/15] net: remove no longer used netdev_set_bond_master() and netdev_set_master() Jiri Pirko
2012-12-29 10:38 ` [patch net-next 15/15] net: kill dev->master Jiri Pirko
-- strict thread matches above, loose matches on Subject: below --
2012-12-30 11:58 [patch net-next V4 00/15] net: introduce upper device lists and remove dev->master Jiri Pirko
2012-12-30 11:58 ` [patch net-next 02/15] macvlan: add link to upper device Jiri Pirko
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=1356777522-19652-3-git-send-email-jiri@resnulli.us \
--to=jiri@resnulli$(echo .)us \
--cc=amwang@redhat$(echo .)com \
--cc=andy@greyhouse$(echo .)net \
--cc=bhutchings@solarflare$(echo .)com \
--cc=blaschka@linux$(echo .)vnet.ibm.com \
--cc=davem@davemloft$(echo .)net \
--cc=divy@chelsio$(echo .)com \
--cc=ebiederm@xmission$(echo .)com \
--cc=edumazet@google$(echo .)com \
--cc=faisal.latif@intel$(echo .)com \
--cc=fbl@redhat$(echo .)com \
--cc=fubar@us$(echo .)ibm.com \
--cc=hal.rosenstock@gmail$(echo .)com \
--cc=heiko.carstens@de$(echo .)ibm.com \
--cc=jitendra.kalsaria@qlogic$(echo .)com \
--cc=joe@perches$(echo .)com \
--cc=john.r.fastabend@intel$(echo .)com \
--cc=kaber@trash$(echo .)net \
--cc=linux-driver@qlogic$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=nhorman@tuxdriver$(echo .)com \
--cc=pablo@netfilter$(echo .)org \
--cc=roland@kernel$(echo .)org \
--cc=schwidefsky@de$(echo .)ibm.com \
--cc=sean.hefty@intel$(echo .)com \
--cc=shemminger@vyatta$(echo .)com \
--cc=sony.chacko@qlogic$(echo .)com \
--cc=ursula.braun@de$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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