Commit b4730016 authored by David S. Miller's avatar David S. Miller

net: Do not fire linkwatch events until the device is registered.

Several device drivers try to do things like netif_carrier_off()
before register_netdev() is invoked.  This is bogus, but too many
drivers do this to fix them all up in one go.
Reported-by: default avatarFolkert van Heusden <folkert@vanheusden.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 566521d6
...@@ -270,6 +270,8 @@ static void dev_watchdog_down(struct net_device *dev) ...@@ -270,6 +270,8 @@ static void dev_watchdog_down(struct net_device *dev)
void netif_carrier_on(struct net_device *dev) void netif_carrier_on(struct net_device *dev)
{ {
if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state)) { if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state)) {
if (dev->reg_state == NETREG_UNINITIALIZED)
return;
linkwatch_fire_event(dev); linkwatch_fire_event(dev);
if (netif_running(dev)) if (netif_running(dev))
__netdev_watchdog_up(dev); __netdev_watchdog_up(dev);
...@@ -285,8 +287,11 @@ EXPORT_SYMBOL(netif_carrier_on); ...@@ -285,8 +287,11 @@ EXPORT_SYMBOL(netif_carrier_on);
*/ */
void netif_carrier_off(struct net_device *dev) void netif_carrier_off(struct net_device *dev)
{ {
if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state)) if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state)) {
if (dev->reg_state == NETREG_UNINITIALIZED)
return;
linkwatch_fire_event(dev); linkwatch_fire_event(dev);
}
} }
EXPORT_SYMBOL(netif_carrier_off); EXPORT_SYMBOL(netif_carrier_off);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment