Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / drivers / net / e100.c

diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 2001a63794f59c142d8ff828b7aa4eb94311bb50..9f38b16ccbbd1b58f308225d15e59f94f1585a1c 100644 (file)
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -1580,11 +1580,13 @@ static void e100_watchdog(unsigned long data)
        mii_ethtool_gset(&nic->mii, &cmd);
 
        if(mii_link_ok(&nic->mii) && !netif_carrier_ok(nic->netdev)) {
-               DPRINTK(LINK, INFO, "link up, %sMbps, %s-duplex\n",
-                       cmd.speed == SPEED_100 ? "100" : "10",
-                       cmd.duplex == DUPLEX_FULL ? "full" : "half");
+               printk(KERN_INFO "e100: %s NIC Link is Up %s Mbps %s Duplex\n",
+                      nic->netdev->name,
+                      cmd.speed == SPEED_100 ? "100" : "10",
+                      cmd.duplex == DUPLEX_FULL ? "Full" : "Half");
        } else if(!mii_link_ok(&nic->mii) && netif_carrier_ok(nic->netdev)) {
-               DPRINTK(LINK, INFO, "link down\n");
+               printk(KERN_INFO "e100: %s NIC Link is Down\n",
+                      nic->netdev->name);
        }
 
        mii_check_link(&nic->mii);
@@ -2047,9 +2049,9 @@ static irqreturn_t e100_intr(int irq, void *dev_id)
        if(stat_ack & stat_ack_rnr)
                nic->ru_running = RU_SUSPENDED;
 
-       if(likely(netif_rx_schedule_prep(netdev, &nic->napi))) {
+       if(likely(netif_rx_schedule_prep(&nic->napi))) {
                e100_disable_irq(nic);
-               __netif_rx_schedule(netdev, &nic->napi);
+               __netif_rx_schedule(&nic->napi);
        }
 
        return IRQ_HANDLED;
@@ -2058,7 +2060,6 @@ static irqreturn_t e100_intr(int irq, void *dev_id)
 static int e100_poll(struct napi_struct *napi, int budget)
 {
        struct nic *nic = container_of(napi, struct nic, napi);
-       struct net_device *netdev = nic->netdev;
        unsigned int work_done = 0;
 
        e100_rx_clean(nic, &work_done, budget);
@@ -2066,7 +2067,7 @@ static int e100_poll(struct napi_struct *napi, int budget)
 
        /* If budget not fully consumed, exit the polling mode */
        if (work_done < budget) {
-               netif_rx_complete(netdev, napi);
+               netif_rx_complete(napi);
                e100_enable_irq(nic);
        }