1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index 5c5fb59adf76..deb395a82e50 100644
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -559,15 +559,17 @@ static int vnet_ack(struct vnet_port *port, void *msgbuf)
                 return 0;
 
         end = pkt->end_idx;
-        if (unlikely(!idx_is_pending(dr, end)))
-                return 0;
-
         vp = port->vp;
         dev = vp->dev;
+        netif_tx_lock(dev);
+        if (unlikely(!idx_is_pending(dr, end))) {
+                netif_tx_unlock(dev);
+                return 0;
+        }
+
         /* sync for race conditions with vnet_start_xmit() and tell xmit it
          * is time to send a trigger.
          */
-        netif_tx_lock(dev);
         dr->cons = next_idx(end, dr);
         desc = vio_dring_entry(dr, dr->cons);
         if (desc->hdr.state == VIO_DESC_READY && port->start_cons) {