diff options
| author | David S. Miller <davem@davemloft.net> | 2014-02-19 07:24:22 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-19 07:24:22 +0100 |
| commit | 1e8d6421cff2c24fe0b345711e7a21af02e8bcf5 (patch) | |
| tree | 773b30106efb9b48055bc93958e5a94ac53768ce /drivers/net/macvlan.c | |
| parent | rtnl: make ifla_policy static (diff) | |
| parent | Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux (diff) | |
| download | linux-1e8d6421cff2c24fe0b345711e7a21af02e8bcf5.tar.xz linux-1e8d6421cff2c24fe0b345711e7a21af02e8bcf5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/bonding/bond_3ad.h
drivers/net/bonding/bond_main.c
Two minor conflicts in bonding, both of which were overlapping
changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvlan.c')
| -rw-r--r-- | drivers/net/macvlan.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 25685e3eb472..44227c25a276 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -872,14 +872,15 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev, dev->priv_flags |= IFF_MACVLAN; err = netdev_upper_dev_link(lowerdev, dev); if (err) - goto destroy_port; - + goto unregister_netdev; list_add_tail_rcu(&vlan->list, &port->vlans); netif_stacked_transfer_operstate(lowerdev, dev); return 0; +unregister_netdev: + unregister_netdevice(dev); destroy_port: port->count -= 1; if (!port->count) |