drivers: net: remove NETDEV_TX_LOCKED

replace the trylock by a full spin_lock and remove TX_LOCKED return value.
Followup patch will remove TX_LOCKED from the kernel.

Cc: Jon Mason <jdmason@kudzu.us>
Cc: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 4 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 3b98b263bad0..4475dcc687a2 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,10 +2137,8 @@ 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;
 
-        if (!spin_trylock_irqsave(&tx_ring->tx_lock, flags)) {
-                /* Collision - tell upper layer to requeue */
-                return NETDEV_TX_LOCKED;
-        }
+        spin_trylock_irqsave(&tx_ring->tx_lock, flags);
+
         if (unlikely(!PCH_GBE_DESC_UNUSED(tx_ring))) {
                 netif_stop_queue(netdev);
                 spin_unlock_irqrestore(&tx_ring->tx_lock, flags);