Skip to content

Commit

Permalink
sky2: fix hard hang with netconsoling and iface going up
Browse files Browse the repository at this point in the history
Printing anything over netconsole before hw is up and running is,
of course, not going to work.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Alexey Dobriyan authored and David S. Miller committed Jan 30, 2009
1 parent f99ec06 commit a11da89
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/net/sky2.c
Original file line number Diff line number Diff line change
Expand Up @@ -1403,9 +1403,6 @@ static int sky2_up(struct net_device *dev)

}

if (netif_msg_ifup(sky2))
printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);

netif_carrier_off(dev);

/* must be power of 2 */
Expand Down Expand Up @@ -1484,6 +1481,9 @@ static int sky2_up(struct net_device *dev)
sky2_write32(hw, B0_IMSK, imask);

sky2_set_multicast(dev);

if (netif_msg_ifup(sky2))
printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);
return 0;

err_out:
Expand Down

0 comments on commit a11da89

Please sign in to comment.