tg3: Preserve register settings for DASH

[linux-2.6] / drivers / net / ucc_geth.c

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 07933f71b86d0aa81c5a3533a0b10b9a9655e743..8f944e57fd55932e0fcc0b21ba51c6fdb0dc8a84 100644 (file)
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -28,8 +28,8 @@
 #include <linux/mii.h>
 #include <linux/phy.h>
 #include <linux/workqueue.h>
+#include <linux/of_platform.h>
 
-#include <asm/of_platform.h>
 #include <asm/uaccess.h>
 #include <asm/irq.h>
 #include <asm/io.h>
@@ -1588,7 +1588,6 @@ static void adjust_link(struct net_device *dev)
                if (!ugeth->oldlink) {
                        new_state = 1;
                        ugeth->oldlink = 1;
-                       netif_schedule(dev);
                }
        } else if (ugeth->oldlink) {
                        new_state = 1;
@@ -3372,7 +3371,7 @@ static void ucc_geth_timeout(struct net_device *dev)
                ucc_geth_startup(ugeth);
        }
 
-       netif_schedule(dev);
+       netif_tx_schedule_all(dev);
 }
 
 /* This is called by the kernel when a frame is ready for transmission. */