From owner-svn-src-all@freebsd.org  Tue Jun 30 20:45:42 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 048E4991707;
 Tue, 30 Jun 2015 20:45:42 +0000 (UTC)
 (envelope-from davidcs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 E961D1D11;
 Tue, 30 Jun 2015 20:45:41 +0000 (UTC)
 (envelope-from davidcs@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5UKjf7D019432;
 Tue, 30 Jun 2015 20:45:41 GMT (envelope-from davidcs@FreeBSD.org)
Received: (from davidcs@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5UKjfvD019431;
 Tue, 30 Jun 2015 20:45:41 GMT (envelope-from davidcs@FreeBSD.org)
Message-Id: <201506302045.t5UKjfvD019431@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: davidcs set sender to
 davidcs@FreeBSD.org using -f
From: David C Somayajulu <davidcs@FreeBSD.org>
Date: Tue, 30 Jun 2015 20:45:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: svn commit: r284981 - stable/7/sys/dev/bxe
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Jun 2015 20:45:42 -0000

Author: davidcs
Date: Tue Jun 30 20:45:41 2015
New Revision: 284981
URL: https://svnweb.freebsd.org/changeset/base/284981

Log:
  MFC r284739
  tx_mtx should be grabbed before calling buf_ring_dequeue_sc()
  
  Submitted by: Attilio.Rao@isilon.com

Modified:
  stable/7/sys/dev/bxe/bxe.c
Directory Properties:
  stable/7/sys/   (props changed)

Modified: stable/7/sys/dev/bxe/bxe.c
==============================================================================
--- stable/7/sys/dev/bxe/bxe.c	Tue Jun 30 20:40:38 2015	(r284980)
+++ stable/7/sys/dev/bxe/bxe.c	Tue Jun 30 20:45:41 2015	(r284981)
@@ -6564,10 +6564,14 @@ bxe_free_fp_buffers(struct bxe_softc *sc
 
 #if __FreeBSD_version >= 800000
         if (fp->tx_br != NULL) {
-            struct mbuf *m;
             /* just in case bxe_mq_flush() wasn't called */
-            while ((m = buf_ring_dequeue_sc(fp->tx_br)) != NULL) {
-                m_freem(m);
+            if (mtx_initialized(&fp->tx_mtx)) {
+                struct mbuf *m;
+
+                BXE_FP_TX_LOCK(fp);
+                while ((m = buf_ring_dequeue_sc(fp->tx_br)) != NULL)
+                    m_freem(m);
+                BXE_FP_TX_UNLOCK(fp);
             }
             buf_ring_free(fp->tx_br, M_DEVBUF);
             fp->tx_br = NULL;