| From e3b60d791cce9b5de6312843e574cd11620fb3a6 Mon Sep 17 00:00:00 2001 |
| From: Alexey Dobriyan <adobriyan@gmail.com> |
| Date: Fri, 30 Jan 2009 13:45:31 -0800 |
| Subject: sky2: fix hard hang with netconsoling and iface going up |
| |
| From: Alexey Dobriyan <adobriyan@gmail.com> |
| |
| [ 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> |
| |
| --- |
| drivers/net/sky2.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/net/sky2.c |
| +++ b/drivers/net/sky2.c |
| @@ -1403,9 +1403,6 @@ static int sky2_up(struct net_device *de |
| |
| } |
| |
| - 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 *de |
| 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: |
