From owner-p4-projects@FreeBSD.ORG  Wed Aug  3 11:52:04 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 55E8F16A421; Wed,  3 Aug 2005 11:52:04 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2ACD316A41F
	for <perforce@freebsd.org>; Wed,  3 Aug 2005 11:52:04 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EBD4343D45
	for <perforce@freebsd.org>; Wed,  3 Aug 2005 11:52:03 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j73Bq3ib080664
	for <perforce@freebsd.org>; Wed, 3 Aug 2005 11:52:03 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j73Bq31C080661
	for perforce@freebsd.org; Wed, 3 Aug 2005 11:52:03 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 3 Aug 2005 11:52:03 GMT
Message-Id: <200508031152.j73Bq31C080661@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 81399 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Aug 2005 11:52:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=81399

Change 81399 by rwatson@rwatson_zoo on 2005/08/03 11:51:42

	When I merged the addition of if_addr_mtx to CVS, I moved it from
	part-way through the data structure to the end for ABI reasons.
	When I integrated, both instances remained, so remove the one in
	the middle, since the one at the end is preferred.

Affected files ...

.. //depot/projects/netsmp/src/sys/net/if_var.h#6 edit

Differences ...

==== //depot/projects/netsmp/src/sys/net/if_var.h#6 (text+ko) ====

@@ -177,7 +177,6 @@
 	void	*if_afdata[AF_MAX];
 	int	if_afdata_initialized;
 	struct	mtx if_afdata_mtx;
-	struct	mtx if_addr_mtx;	/* mutex to protect address lists */
 	struct	task if_starttask;	/* task for IFF_NEEDSGIANT */
 	struct	task if_linktask;	/* task for link change events */
 	struct	mtx if_addr_mtx;	/* mutex to protect address lists */