Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (37 commits)
  forcedeth bug fix: realtek phy
  forcedeth bug fix: vitesse phy
  forcedeth bug fix: cicada phy
  atl1: reorder atl1_main functions
  atl1: fix excessively indented code
  atl1: cleanup atl1_main
  atl1: header file cleanup
  atl1: remove irq_sem
  cdc-subset to support new vendor/product ID
  8139cp: implement the missing dev->tx_timeout
  myri10ge: Remove nonsensical limit in the tx done routine
  gianfar: kill unused header
  EP93XX_ETH must select MII
  macb: Add multicast capability
  macb: Use generic PHY layer
  s390: add barriers to qeth driver
  s390: scatter-gather for inbound traffic in qeth driver
  eHEA: Introducing support vor DLPAR memory add
  Fix a potential NULL pointer dereference in free_shared_mem() in drivers/net/s2io.c
  [PATCH] softmac: Fix ESSID problem
  ...

1 files changed, 24 insertions, 3 deletions

diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 807e6992e614..e970e64bf966 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -26,7 +26,6 @@
 
         TODO:
         * Test Tx checksumming thoroughly
-        * Implement dev->tx_timeout
 
         Low priority TODO:
         * Complete reset on PciErr
@@ -1218,6 +1217,30 @@ static int cp_close (struct net_device *dev)
         return 0;
 }
 
+static void cp_tx_timeout(struct net_device *dev)
+{
+        struct cp_private *cp = netdev_priv(dev);
+        unsigned long flags;
+        int rc;
+
+        printk(KERN_WARNING "%s: Transmit timeout, status %2x %4x %4x %4x\n",
+               dev->name, cpr8(Cmd), cpr16(CpCmd),
+               cpr16(IntrStatus), cpr16(IntrMask));
+
+        spin_lock_irqsave(&cp->lock, flags);
+
+        cp_stop_hw(cp);
+        cp_clean_rings(cp);
+        rc = cp_init_rings(cp);
+        cp_start_hw(cp);
+
+        netif_wake_queue(dev);
+
+        spin_unlock_irqrestore(&cp->lock, flags);
+
+        return;
+}
+
 #ifdef BROKEN
 static int cp_change_mtu(struct net_device *dev, int new_mtu)
 {
@@ -1920,10 +1943,8 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         dev->change_mtu = cp_change_mtu;
 #endif
         dev->ethtool_ops = &cp_ethtool_ops;
-#if 0
         dev->tx_timeout = cp_tx_timeout;
         dev->watchdog_timeo = TX_TIMEOUT;
-#endif
 
 #if CP_VLAN_TAG_USED
         dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_RX;