equal
deleted
inserted
replaced
3425 return NETDEV_TX_LOCKED; |
3425 return NETDEV_TX_LOCKED; |
3426 |
3426 |
3427 /* need: count + 2 desc gap to keep tail from touching |
3427 /* need: count + 2 desc gap to keep tail from touching |
3428 * head, otherwise try next time */ |
3428 * head, otherwise try next time */ |
3429 if (unlikely(e1000_maybe_stop_tx(netdev, tx_ring, count + 2))) { |
3429 if (unlikely(e1000_maybe_stop_tx(netdev, tx_ring, count + 2))) { |
3430 spin_unlock_irqrestore(&tx_ring->tx_lock, flags); |
3430 if (!adapter->ecdev) { |
|
3431 spin_unlock_irqrestore(&tx_ring->tx_lock, flags); |
|
3432 } |
3431 return NETDEV_TX_BUSY; |
3433 return NETDEV_TX_BUSY; |
3432 } |
3434 } |
3433 |
3435 |
3434 if (unlikely(adapter->hw.mac_type == e1000_82547)) { |
3436 if (unlikely(adapter->hw.mac_type == e1000_82547)) { |
3435 if (unlikely(e1000_82547_fifo_workaround(adapter, skb))) { |
3437 if (unlikely(e1000_82547_fifo_workaround(adapter, skb))) { |