1 files changed, 5 insertions, 8 deletions

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index cc7328b15521..765210ea097d 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -818,7 +818,7 @@ struct fe_priv {
  * Maximum number of loops until we assume that a bit in the irq mask
  * is stuck. Overridable with module param.
  */
-static int max_interrupt_work = 5;
+static int max_interrupt_work = 15;
 
 /*
  * Optimization can be either throuput mode or cpu mode
@@ -2735,7 +2735,6 @@ static int nv_rx_process(struct net_device *dev, int limit)
 #else
                 netif_rx(skb);
 #endif
-                dev->last_rx = jiffies;
                 dev->stats.rx_packets++;
                 dev->stats.rx_bytes += len;
 next_pkt:
@@ -2848,7 +2847,6 @@ static int nv_rx_process_optimized(struct net_device *dev, int limit)
                                 }
                         }
 
-                        dev->last_rx = jiffies;
                         dev->stats.rx_packets++;
                         dev->stats.rx_bytes += len;
                 } else {
@@ -5420,7 +5418,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
         u32 powerstate, txreg;
         u32 phystate_orig = 0, phystate;
         int phyinitialized = 0;
-        DECLARE_MAC_BUF(mac);
         static int printed_version;
 
         if (!printed_version++)
@@ -5653,8 +5650,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                  * to 01:23:45:67:89:ab
                  */
                 dev_printk(KERN_ERR, &pci_dev->dev,
-                        "Invalid Mac address detected: %s\n",
-                        print_mac(mac, dev->dev_addr));
+                        "Invalid Mac address detected: %pM\n",
+                        dev->dev_addr);
                 dev_printk(KERN_ERR, &pci_dev->dev,
                         "Please complain to your hardware vendor. Switching to a random MAC.\n");
                 dev->dev_addr[0] = 0x00;
@@ -5663,8 +5660,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                 get_random_bytes(&dev->dev_addr[3], 3);
         }
 
-        dprintk(KERN_DEBUG "%s: MAC Address %s\n",
-                pci_name(pci_dev), print_mac(mac, dev->dev_addr));
+        dprintk(KERN_DEBUG "%s: MAC Address %pM\n",
+                pci_name(pci_dev), dev->dev_addr);
 
         /* set mac address */
         nv_copy_mac_to_hw(dev);