From owner-svn-src-all@FreeBSD.ORG  Sat Sep 19 14:55:13 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 65BE91065693;
	Sat, 19 Sep 2009 14:55:13 +0000 (UTC)
	(envelope-from tuexen@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 54AC38FC2D;
	Sat, 19 Sep 2009 14:55:13 +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 n8JEtCJ4028302;
	Sat, 19 Sep 2009 14:55:12 GMT (envelope-from tuexen@svn.freebsd.org)
Received: (from tuexen@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8JEtCLC028300;
	Sat, 19 Sep 2009 14:55:12 GMT (envelope-from tuexen@svn.freebsd.org)
Message-Id: <200909191455.n8JEtCLC028300@svn.freebsd.org>
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Sat, 19 Sep 2009 14:55:12 +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: r197328 - head/sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Sep 2009 14:55:13 -0000

Author: tuexen
Date: Sat Sep 19 14:55:12 2009
New Revision: 197328
URL: http://svn.freebsd.org/changeset/base/197328

Log:
  Use appropriate locking when using interface list.
  
  Approved by: rrs (mentor)
  MFC after: 1 month.

Modified:
  head/sys/netinet/sctp_bsd_addr.c

Modified: head/sys/netinet/sctp_bsd_addr.c
==============================================================================
--- head/sys/netinet/sctp_bsd_addr.c	Sat Sep 19 14:18:42 2009	(r197327)
+++ head/sys/netinet/sctp_bsd_addr.c	Sat Sep 19 14:55:12 2009	(r197328)
@@ -208,9 +208,7 @@ sctp_init_ifns_for_vrf(int vrfid)
 	struct sctp_ifa *sctp_ifa;
 	uint32_t ifa_flags;
 
-#if 0
 	IFNET_RLOCK();
-#endif
 	TAILQ_FOREACH(ifn, &MODULE_GLOBAL(ifnet), if_list) {
 		IF_ADDR_LOCK(ifn);
 		TAILQ_FOREACH(ifa, &ifn->if_addrlist, ifa_list) {
@@ -256,9 +254,7 @@ sctp_init_ifns_for_vrf(int vrfid)
 		}
 		IF_ADDR_UNLOCK(ifn);
 	}
-#if 0
 	IFNET_RUNLOCK();
-#endif
 }
 
 void
@@ -344,9 +340,7 @@ void
 	struct ifnet *ifn;
 	struct ifaddr *ifa;
 
-#if 0
 	IFNET_RLOCK();
-#endif
 	TAILQ_FOREACH(ifn, &MODULE_GLOBAL(ifnet), if_list) {
 		if (!(*pred) (ifn)) {
 			continue;
@@ -355,9 +349,7 @@ void
 			sctp_addr_change(ifa, add ? RTM_ADD : RTM_DELETE);
 		}
 	}
-#if 0
 	IFNET_RUNLOCK();
-#endif
 }
 
 struct mbuf *