From owner-svn-src-projects@FreeBSD.ORG  Fri Feb 27 01:20:18 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 10D0DBCF;
 Fri, 27 Feb 2015 01:20:18 +0000 (UTC)
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 EFE7B812;
 Fri, 27 Feb 2015 01:20:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1R1KHI8039160;
 Fri, 27 Feb 2015 01:20:17 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1R1KHox039159;
 Fri, 27 Feb 2015 01:20:17 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201502270120.t1R1KHox039159@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Fri, 27 Feb 2015 01:20:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r279343 - projects/ifnet/sys/net
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Feb 2015 01:20:18 -0000

Author: glebius
Date: Fri Feb 27 01:20:17 2015
New Revision: 279343
URL: https://svnweb.freebsd.org/changeset/base/279343

Log:
  Use mbufq_drain() instead of pasting it.

Modified:
  projects/ifnet/sys/net/if.c

Modified: projects/ifnet/sys/net/if.c
==============================================================================
--- projects/ifnet/sys/net/if.c	Fri Feb 27 01:15:23 2015	(r279342)
+++ projects/ifnet/sys/net/if.c	Fri Feb 27 01:20:17 2015	(r279343)
@@ -3563,17 +3563,11 @@ if_snd_free(struct ifqueue *ifq)
 static void
 if_snd_qflush(if_t ifp)
 {
-	struct ifqueue *ifq;
-	struct mbuf *m, *n;
-	
-	ifq = ifp->if_snd;
+	struct ifqueue *ifq = ifp->if_snd;
+
 	mtx_lock(&ifq->ifq_mtx);
-	n = mbufq_flush(&ifq->ifq_mbq);
+	mbufq_drain(&ifq->ifq_mbq);
 	mtx_unlock(&ifq->ifq_mtx);
-	while ((m = n) != NULL) {
-		n = m->m_nextpkt;
-		m_freem(m);
-	}
 }
 
 int