svn commit: r338551 - stable/10/sys/dev/mlx5/mlx5_en

[Hans Petter Selasky]

Author: hselasky
Date: Mon Sep 10 08:06:34 2018
New Revision: 338551
URL: https://svnweb.freebsd.org/changeset/base/338551

Log:
  MFC r338490:
  Don't stall transmit queue on drops in mlx5en(4).
  
  When a transmitted packet is dropped don't stall the transmit queue.
  
  Sponsored by:		Mellanox Technologies

Modified:
  stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
==============================================================================
--- stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c	Mon Sep 10 08:05:36 2018	(r338550)
+++ stable/10/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c	Mon Sep 10 08:06:34 2018	(r338551)
@@ -515,13 +515,11 @@ mlx5e_xmit_locked(struct ifnet *ifp, struct mlx5e_sq *
 	/* Process the queue */
 	while ((next = drbr_peek(ifp, sq->br)) != NULL) {
 		if (mlx5e_sq_xmit(sq, &next) != 0) {
-			if (next == NULL) {
-				drbr_advance(ifp, sq->br);
-			} else {
+			if (next != NULL) {
 				drbr_putback(ifp, sq->br, next);
 				atomic_store_rel_int(&sq->queue_state, MLX5E_SQ_FULL);
+				break;
 			}
-			break;
 		}
 		drbr_advance(ifp, sq->br);
 	}