From owner-svn-src-head@FreeBSD.ORG  Tue Jun  2 18:53:22 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 543B3106566C;
	Tue,  2 Jun 2009 18:53:22 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 42A998FC18;
	Tue,  2 Jun 2009 18:53:22 +0000 (UTC) (envelope-from sam@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 n52IrMIG025147;
	Tue, 2 Jun 2009 18:53:22 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n52IrMsU025146;
	Tue, 2 Jun 2009 18:53:22 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200906021853.n52IrMsU025146@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Tue, 2 Jun 2009 18:53:22 +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: r193336 - 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, 02 Jun 2009 18:53:22 -0000

Author: sam
Date: Tue Jun  2 18:53:21 2009
New Revision: 193336
URL: http://svn.freebsd.org/changeset/base/193336

Log:
  move ifq_detach from if_detach to if_free; this permits callers to
  reference if_snd in the period between detach+free which helps simplify
  detach code
  
  Reviewed by:	jhb, rwatson

Modified:
  head/sys/net/if.c

Modified: head/sys/net/if.c
==============================================================================
--- head/sys/net/if.c	Tue Jun  2 18:53:21 2009	(r193335)
+++ head/sys/net/if.c	Tue Jun  2 18:53:21 2009	(r193336)
@@ -574,6 +574,7 @@ if_free_internal(struct ifnet *ifp)
 	knlist_destroy(&ifp->if_klist);
 	IF_AFDATA_DESTROY(ifp);
 	IF_ADDR_LOCK_DESTROY(ifp);
+	ifq_detach(&ifp->if_snd);
 	free(ifp, M_IFNET);
 }
 
@@ -1025,9 +1026,6 @@ if_detach_internal(struct ifnet *ifp, in
 	}
 	ifp->if_afdata_initialized = 0;
 	IF_AFDATA_UNLOCK(ifp);
-
-	if (!vmove)
-		ifq_detach(&ifp->if_snd);
 }
 
 #ifdef VIMAGE