Commit 0e7dd0c9 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

pch_gbe: fix bogus trylock conversion

Should have converted 'if (trylock)' to 'lock'.

Fixes: a6086a89

 ("drivers: net: remove NETDEV_TX_LOCKED")
Signed-off-by: default avatarFlorian Westphal <>
Signed-off-by: default avatarDavid S. Miller <>
parent 50d5d2bd
......@@ -2137,7 +2137,7 @@ static int pch_gbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
struct pch_gbe_tx_ring *tx_ring = adapter->tx_ring;
unsigned long flags;
spin_trylock_irqsave(&tx_ring->tx_lock, flags);
spin_lock_irqsave(&tx_ring->tx_lock, flags);
if (unlikely(!PCH_GBE_DESC_UNUSED(tx_ring))) {
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment