1 files changed, 15 insertions, 17 deletions

diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index 26bf1b76b997..c7a9bef4dfb0 100644
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -135,6 +135,7 @@ struct korina_private {
         struct napi_struct napi;
         struct timer_list media_check_timer;
         struct mii_if_info mii_if;
+        struct work_struct restart_task;
         struct net_device *dev;
         int phy_addr;
 };
@@ -375,7 +376,7 @@ static int korina_rx(struct net_device *dev, int limit)
                 if (devcs & ETH_RX_LE)
                         dev->stats.rx_length_errors++;
                 if (devcs & ETH_RX_OVR)
-                        dev->stats.rx_over_errors++;
+                        dev->stats.rx_fifo_errors++;
                 if (devcs & ETH_RX_CV)
                         dev->stats.rx_frame_errors++;
                 if (devcs & ETH_RX_CES)
@@ -764,10 +765,9 @@ static int korina_alloc_ring(struct net_device *dev)
 
         /* Initialize the receive descriptors */
         for (i = 0; i < KORINA_NUM_RDS; i++) {
-                skb = dev_alloc_skb(KORINA_RBSIZE + 2);
+                skb = netdev_alloc_skb_ip_align(dev, KORINA_RBSIZE);
                 if (!skb)
                         return -ENOMEM;
-                skb_reserve(skb, 2);
                 lp->rx_skb[i] = skb;
                 lp->rd_ring[i].control = DMA_DESC_IOD |
                                 DMA_COUNT(KORINA_RBSIZE);
@@ -890,12 +890,12 @@ static int korina_init(struct net_device *dev)
 
 /*
  * Restart the RC32434 ethernet controller.
- * FIXME: check the return status where we call it
  */
-static int korina_restart(struct net_device *dev)
+static void korina_restart_task(struct work_struct *work)
 {
-        struct korina_private *lp = netdev_priv(dev);
-        int ret;
+        struct korina_private *lp = container_of(work,
+                        struct korina_private, restart_task);
+        struct net_device *dev = lp->dev;
 
         /*
          * Disable interrupts
@@ -916,10 +916,9 @@ static int korina_restart(struct net_device *dev)
 
         napi_disable(&lp->napi);
 
-        ret = korina_init(dev);
-        if (ret < 0) {
+        if (korina_init(dev) < 0) {
                 printk(KERN_ERR "%s: cannot restart device\n", dev->name);
-                return ret;
+                return;
         }
         korina_multicast_list(dev);
 
@@ -927,8 +926,6 @@ static int korina_restart(struct net_device *dev)
         enable_irq(lp->ovr_irq);
         enable_irq(lp->tx_irq);
         enable_irq(lp->rx_irq);
-
-        return ret;
 }
 
 static void korina_clear_and_restart(struct net_device *dev, u32 value)
@@ -937,7 +934,7 @@ static void korina_clear_and_restart(struct net_device *dev, u32 value)
 
         netif_stop_queue(dev);
         writel(value, &lp->eth_regs->ethintfc);
-        korina_restart(dev);
+        schedule_work(&lp->restart_task);
 }
 
 /* Ethernet Tx Underflow interrupt */
@@ -962,11 +959,8 @@ static irqreturn_t korina_und_interrupt(int irq, void *dev_id)
 static void korina_tx_timeout(struct net_device *dev)
 {
         struct korina_private *lp = netdev_priv(dev);
-        unsigned long flags;
 
-        spin_lock_irqsave(&lp->lock, flags);
-        korina_restart(dev);
-        spin_unlock_irqrestore(&lp->lock, flags);
+        schedule_work(&lp->restart_task);
 }
 
 /* Ethernet Rx Overflow interrupt */
@@ -1086,6 +1080,8 @@ static int korina_close(struct net_device *dev)
 
         napi_disable(&lp->napi);
 
+        cancel_work_sync(&lp->restart_task);
+
         free_irq(lp->rx_irq, dev);
         free_irq(lp->tx_irq, dev);
         free_irq(lp->ovr_irq, dev);
@@ -1198,6 +1194,8 @@ static int korina_probe(struct platform_device *pdev)
         }
         setup_timer(&lp->media_check_timer, korina_poll_media, (unsigned long) dev);
 
+        INIT_WORK(&lp->restart_task, korina_restart_task);
+
         printk(KERN_INFO "%s: " DRV_NAME "-" DRV_VERSION " " DRV_RELDATE "\n",
                         dev->name);
 out: