oprofile: change cpu_buffer from array to per_cpu variable

[linux-2.6-omap-h63xx.git] / drivers / net / sky2.c

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 54c662690f65482b613954918ce499121a84ea61..f226bcac7d178c600ff19aac04cfe4afe2f7eeec 100644 (file)
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -154,6 +154,7 @@ static const char *yukon2_name[] = {
        "EC",           /* 0xb6 */
        "FE",           /* 0xb7 */
        "FE+",          /* 0xb8 */
+       "Supreme",      /* 0xb9 */
 };
 
 static void sky2_set_multicast(struct net_device *dev);
@@ -4329,10 +4330,14 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
        if (!hw)
                return 0;
 
+       del_timer_sync(&hw->watchdog_timer);
+       cancel_work_sync(&hw->restart_work);
+
        for (i = 0; i < hw->ports; i++) {
                struct net_device *dev = hw->dev[i];
                struct sky2_port *sky2 = netdev_priv(dev);
 
+               netif_device_detach(dev);
                if (netif_running(dev))
                        sky2_down(dev);
 
@@ -4383,6 +4388,8 @@ static int sky2_resume(struct pci_dev *pdev)
 
        for (i = 0; i < hw->ports; i++) {
                struct net_device *dev = hw->dev[i];
+
+               netif_device_attach(dev);
                if (netif_running(dev)) {
                        err = sky2_up(dev);
                        if (err) {