From owner-svn-src-head@FreeBSD.ORG  Mon Mar 15 21:15:03 2010
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 9B97D106566C;
	Mon, 15 Mar 2010 21:15:03 +0000 (UTC)
	(envelope-from mlaier@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8BE838FC15;
	Mon, 15 Mar 2010 21:15:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2FLF3tt078879;
	Mon, 15 Mar 2010 21:15:03 GMT (envelope-from mlaier@svn.freebsd.org)
Received: (from mlaier@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2FLF3AY078877;
	Mon, 15 Mar 2010 21:15:03 GMT (envelope-from mlaier@svn.freebsd.org)
Message-Id: <201003152115.o2FLF3AY078877@svn.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Mon, 15 Mar 2010 21:15:03 +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: r205197 - 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: Mon, 15 Mar 2010 21:15:03 -0000

Author: mlaier
Date: Mon Mar 15 21:15:03 2010
New Revision: 205197
URL: http://svn.freebsd.org/changeset/base/205197

Log:
  Fix a small bug in drbr_dequeue_cond spotted while preparing MFC of r203834.
  
  MFC after:	3 days

Modified:
  head/sys/net/if_var.h

Modified: head/sys/net/if_var.h
==============================================================================
--- head/sys/net/if_var.h	Mon Mar 15 20:25:28 2010	(r205196)
+++ head/sys/net/if_var.h	Mon Mar 15 21:15:03 2010	(r205197)
@@ -645,7 +645,7 @@ drbr_dequeue_cond(struct ifnet *ifp, str
 			IFQ_UNLOCK(&ifp->if_snd);
 			return (NULL);
 		}
-		IFQ_DEQUEUE(&ifp->if_snd, m);
+		IFQ_DEQUEUE_NOLOCK(&ifp->if_snd, m);
 		IFQ_UNLOCK(&ifp->if_snd);
 		return (m);
 	}