diff options
| author | Florian Westphal <fw@strlen.de> | 2016-04-26 23:14:30 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-26 17:36:33 -0400 |
| commit | 0e7dd0c9c3cde901f79f04260aa706bbfdc0c67e (patch) | |
| tree | 74e4b914940c1eb1ef9dd16910cdc7794eb06f93 /drivers/net/ethernet | |
| parent | 50d5d2bd1d4273f1417135965a151e13f1f061c4 (diff) | |
| download | linux-0e7dd0c9c3cde901f79f04260aa706bbfdc0c67e.tar.bz2 | |
pch_gbe: fix bogus trylock conversion
Should have converted 'if (trylock)' to 'lock'.
Fixes: a6086a893718db ("drivers: net: remove NETDEV_TX_LOCKED")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index 4475dcc687a2..ca4add749410 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -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))) { netif_stop_queue(netdev); |