svn commit: r338490 - head/sys/dev/mlx5/mlx5_en

[Hans Petter Selasky]

Author: hselasky
Date: Thu Sep  6 12:19:36 2018
New Revision: 338490
URL: https://svnweb.freebsd.org/changeset/base/338490

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

Modified:
  head/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c

Modified: head/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c
==============================================================================
--- head/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c	Thu Sep  6 11:06:07 2018	(r338489)
+++ head/sys/dev/mlx5/mlx5_en/mlx5_en_tx.c	Thu Sep  6 12:19:36 2018	(r338490)
@@ -528,13 +528,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);
 	}