* [PATCH -next] pch_gbe: fix bogus trylock conversion
@ 2016-04-26 21:14 Florian Westphal
2016-04-26 21:42 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Florian Westphal @ 2016-04-26 21:14 UTC (permalink / raw)
To: netdev; +Cc: Florian Westphal
Should have converted 'if (trylock)' to 'lock'.
Fixes: a6086a893718db ("drivers: net: remove NETDEV_TX_LOCKED")
Signed-off-by: Florian Westphal <fw@strlen.de>
---
I re-checked the series and this was the only place where I messed up.
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 4475dcc..ca4add7 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);
--
2.7.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] pch_gbe: fix bogus trylock conversion
2016-04-26 21:14 [PATCH -next] pch_gbe: fix bogus trylock conversion Florian Westphal
@ 2016-04-26 21:42 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-04-26 21:42 UTC (permalink / raw)
To: fw; +Cc: netdev
From: Florian Westphal <fw@strlen.de>
Date: Tue, 26 Apr 2016 23:14:30 +0200
> Should have converted 'if (trylock)' to 'lock'.
>
> Fixes: a6086a893718db ("drivers: net: remove NETDEV_TX_LOCKED")
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
> I re-checked the series and this was the only place where I messed up.
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-04-26 21:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-26 21:14 [PATCH -next] pch_gbe: fix bogus trylock conversion Florian Westphal
2016-04-26 21:42 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.