diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2009-01-30 13:45:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-30 14:06:26 -0800 |
| commit | a11da890e4c9850411303efcf6514f048ca880ee (patch) | |
| tree | 48cbccd613cf492c485c696137c3d6eff03a6c4d | |
| parent | f99ec0649accb581cf3e8fcfeea796e82d05f4ea (diff) | |
| download | linux-3.10-a11da890e4c9850411303efcf6514f048ca880ee.tar.gz linux-3.10-a11da890e4c9850411303efcf6514f048ca880ee.tar.bz2 linux-3.10-a11da890e4c9850411303efcf6514f048ca880ee.zip | |
sky2: fix hard hang with netconsoling and iface going up
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>
| -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 3668e81e474..994703cc0db 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: |