changeset 1154 | 04bcd38cf8dc |
parent 1152 | 30f168c7f74f |
child 1325 | 16aacb421bd4 |
--- a/devices/e1000/e1000_main-2.6.22-ethercat.c Mon Jul 28 08:17:01 2008 +0000 +++ b/devices/e1000/e1000_main-2.6.22-ethercat.c Mon Jul 28 08:28:42 2008 +0000 @@ -3427,7 +3427,9 @@ /* need: count + 2 desc gap to keep tail from touching * head, otherwise try next time */ if (unlikely(e1000_maybe_stop_tx(netdev, tx_ring, count + 2))) { - spin_unlock_irqrestore(&tx_ring->tx_lock, flags); + if (!adapter->ecdev) { + spin_unlock_irqrestore(&tx_ring->tx_lock, flags); + } return NETDEV_TX_BUSY; }