1 files changed, 1 insertions, 5 deletions

diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index ede937ee50c7..53345daed909 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -175,11 +175,7 @@ static int rionet_start_xmit(struct sk_buff *skb, struct net_device *ndev)
         u16 destid;
         unsigned long flags;
 
-        local_irq_save(flags);
-        if (!spin_trylock(&rnet->tx_lock)) {
-                local_irq_restore(flags);
-                return NETDEV_TX_LOCKED;
-        }
+        spin_lock_irqsave(&rnet->tx_lock, flags);
 
         if ((rnet->tx_cnt + 1) > RIONET_TX_RING_SIZE) {
                 netif_stop_queue(ndev);