diff -r e6264685dd7b -r f564d0929292 devices/8139too.c --- a/devices/8139too.c Thu Mar 02 13:08:07 2006 +0000 +++ b/devices/8139too.c Mon Mar 06 15:12:34 2006 +0000 @@ -1804,21 +1804,16 @@ " (queue head)" : ""); tp->xstats.tx_timeouts++; - - /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/ - - printk(KERN_DEBUG "%s: tx_timeout\n", dev->name); - - if (EtherCAT_dev_is_ec(rtl_ec_dev, dev)) - { - EtherCAT_dev_state(rtl_ec_dev, EC_DEVICE_STATE_TIMEOUT); - } + printk(KERN_DEBUG "%s: tx_timeout\n", dev->name); /* disable Tx ASAP, if not already */ tmp8 = RTL_R8 (ChipCmd); if (tmp8 & CmdTxEnb) RTL_W8 (ChipCmd, CmdRxEnb); + /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/ + + if (!EtherCAT_dev_is_ec(rtl_ec_dev, dev)) { spin_lock(&tp->rx_lock); @@ -1840,7 +1835,7 @@ } spin_unlock(&tp->rx_lock); - } + } else { rtl8139_tx_clear (tp); @@ -1951,14 +1946,6 @@ tp->stats.tx_carrier_errors++; if (txstatus & TxOutOfWindow) tp->stats.tx_window_errors++; - - /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/ - - if (EtherCAT_dev_is_ec(rtl_ec_dev, dev)) - EtherCAT_dev_state(rtl_ec_dev, EC_DEVICE_STATE_ERROR); - - /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ - } else { if (txstatus & TxUnderrun) { /* Add 64 to the Tx FIFO threshold. */ @@ -2033,15 +2020,6 @@ tp->xstats.rx_lost_in_ring++; } - /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/ - - if (EtherCAT_dev_is_ec(rtl_ec_dev, dev)) - { - EtherCAT_dev_state(rtl_ec_dev, EC_DEVICE_STATE_ERROR); - } - - /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/ - #ifndef CONFIG_8139_OLD_RX_RESET tmp8 = RTL_R8 (ChipCmd); RTL_W8 (ChipCmd, tmp8 & ~CmdRxEnb);