From owner-svn-src-head@FreeBSD.ORG  Tue Jun 30 05:21:01 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 01EC8106564A;
	Tue, 30 Jun 2009 05:21:01 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E50F88FC0A;
	Tue, 30 Jun 2009 05:21:00 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5U5L0fp069001;
	Tue, 30 Jun 2009 05:21:00 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5U5L062068999;
	Tue, 30 Jun 2009 05:21:00 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200906300521.n5U5L062068999@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Tue, 30 Jun 2009 05:21:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195182 - head/sys/net
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Jun 2009 05:21:01 -0000

Author: bz
Date: Tue Jun 30 05:21:00 2009
New Revision: 195182
URL: http://svn.freebsd.org/changeset/base/195182

Log:
  In case we cannot queue a packet reaching the queue limit, retain the
  semantics netisr_queue() always had and free the mbuf along with
  returning the error.
  
  Reviewed by:	rwatson
  Approved by:	re (kensmith)

Modified:
  head/sys/net/netisr.c

Modified: head/sys/net/netisr.c
==============================================================================
--- head/sys/net/netisr.c	Tue Jun 30 03:18:51 2009	(r195181)
+++ head/sys/net/netisr.c	Tue Jun 30 05:21:00 2009	(r195182)
@@ -803,6 +803,7 @@ netisr_queue_workstream(struct netisr_wo
 		npwp->nw_queued++;
 		return (0);
 	} else {
+		m_freem(m);
 		npwp->nw_qdrops++;
 		return (ENOBUFS);
 	}