From owner-svn-src-head@FreeBSD.ORG  Mon Sep  6 21:03:30 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 A911A10656A9;
	Mon,  6 Sep 2010 21:03:30 +0000 (UTC)
	(envelope-from will@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 98F4C8FC1D;
	Mon,  6 Sep 2010 21:03:30 +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 o86L3UTU065252;
	Mon, 6 Sep 2010 21:03:30 GMT (envelope-from will@svn.freebsd.org)
Received: (from will@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o86L3UHT065250;
	Mon, 6 Sep 2010 21:03:30 GMT (envelope-from will@svn.freebsd.org)
Message-Id: <201009062103.o86L3UHT065250@svn.freebsd.org>
From: Will Andrews <will@FreeBSD.org>
Date: Mon, 6 Sep 2010 21:03:30 +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: r212265 - head/sys/netinet
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, 06 Sep 2010 21:03:30 -0000

Author: will
Date: Mon Sep  6 21:03:30 2010
New Revision: 212265
URL: http://svn.freebsd.org/changeset/base/212265

Log:
  Fix static kernel builds with carp(4) by changing its SYSINIT order so that
  it is initialized after basic protocol initialization, which allows it to
  register via pf_proto_register().
  
  Reviewed by:	bz
  Approved by:	ken (mentor)

Modified:
  head/sys/netinet/ip_carp.c

Modified: head/sys/netinet/ip_carp.c
==============================================================================
--- head/sys/netinet/ip_carp.c	Mon Sep  6 20:51:35 2010	(r212264)
+++ head/sys/netinet/ip_carp.c	Mon Sep  6 21:03:30 2010	(r212265)
@@ -2405,4 +2405,4 @@ static moduledata_t carp_mod = {
 	0
 };
 
-DECLARE_MODULE(carp, carp_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
+DECLARE_MODULE(carp, carp_mod, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY);