Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Just several instances of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -446,7 +446,11 @@ static int bond_newlink(struct net *src_net, struct net_device *bond_dev,
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
return register_netdevice(bond_dev);
|
||||
err = register_netdevice(bond_dev);
|
||||
|
||||
netif_carrier_off(bond_dev);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static size_t bond_get_size(const struct net_device *bond_dev)
|
||||
|
Reference in New Issue
Block a user