From owner-svn-src-stable@freebsd.org  Mon Aug 14 12:37:00 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04D9EDC4565;
 Mon, 14 Aug 2017 12:37:00 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C74597F15D;
 Mon, 14 Aug 2017 12:36:59 +0000 (UTC)
 (envelope-from hselasky@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7ECawJd052327;
 Mon, 14 Aug 2017 12:36:58 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7ECawGh052326;
 Mon, 14 Aug 2017 12:36:58 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201708141236.v7ECawGh052326@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Mon, 14 Aug 2017 12:36:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r322497 - stable/11/sys/ofed/drivers/net/mlx4
X-SVN-Group: stable-11
X-SVN-Commit-Author: hselasky
X-SVN-Commit-Paths: stable/11/sys/ofed/drivers/net/mlx4
X-SVN-Commit-Revision: 322497
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Aug 2017 12:37:00 -0000

Author: hselasky
Date: Mon Aug 14 12:36:58 2017
New Revision: 322497
URL: https://svnweb.freebsd.org/changeset/base/322497

Log:
  MFC r322305:
  Increment queue drops in the network statistics when transmitted packets
  are dropped by the mlx4en(4) driver.
  
  Submitted by:		Sepherosa Ziehau <sephe@dragonflybsd.org>
  Sponsored by:		Mellanox Technologies

Modified:
  stable/11/sys/ofed/drivers/net/mlx4/en_tx.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/ofed/drivers/net/mlx4/en_tx.c
==============================================================================
--- stable/11/sys/ofed/drivers/net/mlx4/en_tx.c	Mon Aug 14 11:23:07 2017	(r322496)
+++ stable/11/sys/ofed/drivers/net/mlx4/en_tx.c	Mon Aug 14 12:36:58 2017	(r322497)
@@ -1073,6 +1073,10 @@ mlx4_en_transmit(struct ifnet *dev, struct mbuf *m)
 		taskqueue_enqueue(cq->tq, &cq->cq_task);
 	}
 
+#if __FreeBSD_version >= 1100000
+	if (unlikely(err != 0))
+		if_inc_counter(dev, IFCOUNTER_IQDROPS, 1);
+#endif
 	return (err);
 }