diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-01-30 13:45:31 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-17 09:46:22 -0800 |
commit | 3e7e3080004366a05b4d2ef2b746cd654f1e0f4a (patch) | |
tree | bfcb4c018fbf767c587da9d5a8d4a08e76348a9d /drivers/net | |
parent | 7ceec7ed4dfe4e62399fbf395a9c3f4cc54c3d88 (diff) |
sky2: fix hard hang with netconsoling and iface going up
[ Upstream commit a11da890e4c9850411303efcf6514f048ca880ee ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/sky2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index b4be33ab3b6..b68bc39b1c9 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -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 */ @@ -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: |