bonding: Call netif_carrier_off after register_netdevice

Bringing up a bond interface with all network cables disconnected
does not properly set the interface as DOWN because the call to
netif_carrier_off occurs too early in bond_init.  The call needs
to occur after register_netdevice has set dev->reg_state to
NETREG_REGISTERED, so that netif_carrier_off will trigger the
call to linkwatch_fire_event.

Signed-off-by: Phil Oester <kernel@linuxace.com>
Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Phil Oester 2011-03-14 06:22:05 +00:00 committed by David S. Miller
parent fd0e435b0f
commit e826eafa65

View File

@ -4980,8 +4980,6 @@ static int bond_init(struct net_device *bond_dev)
bond_set_lockdep_class(bond_dev); bond_set_lockdep_class(bond_dev);
netif_carrier_off(bond_dev);
bond_create_proc_entry(bond); bond_create_proc_entry(bond);
list_add_tail(&bond->bond_list, &bn->dev_list); list_add_tail(&bond->bond_list, &bn->dev_list);
@ -5051,6 +5049,8 @@ int bond_create(struct net *net, const char *name)
res = register_netdevice(bond_dev); res = register_netdevice(bond_dev);
netif_carrier_off(bond_dev);
out: out:
rtnl_unlock(); rtnl_unlock();
if (res < 0) if (res < 0)