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