equal
deleted
inserted
replaced
3448 } |
3448 } |
3449 |
3449 |
3450 /* need: count + 2 desc gap to keep tail from touching |
3450 /* need: count + 2 desc gap to keep tail from touching |
3451 * head, otherwise try next time */ |
3451 * head, otherwise try next time */ |
3452 if (unlikely(e1000_maybe_stop_tx(netdev, tx_ring, count + 2))) { |
3452 if (unlikely(e1000_maybe_stop_tx(netdev, tx_ring, count + 2))) { |
3453 spin_unlock_irqrestore(&tx_ring->tx_lock, flags); |
3453 if (!adapter->ecdev) { |
|
3454 spin_unlock_irqrestore(&tx_ring->tx_lock, flags); |
|
3455 } |
3454 return NETDEV_TX_BUSY; |
3456 return NETDEV_TX_BUSY; |
3455 } |
3457 } |
3456 |
3458 |
3457 if (unlikely(adapter->hw.mac_type == e1000_82547)) { |
3459 if (unlikely(adapter->hw.mac_type == e1000_82547)) { |
3458 if (unlikely(e1000_82547_fifo_workaround(adapter, skb))) { |
3460 if (unlikely(e1000_82547_fifo_workaround(adapter, skb))) { |