From owner-svn-src-head@FreeBSD.ORG Wed Aug 11 18:36:26 2010 Return-Path: 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 E52C1106567D; Wed, 11 Aug 2010 18:36:26 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id B65578FC20; Wed, 11 Aug 2010 18:36:26 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id 6B22A46B45; Wed, 11 Aug 2010 14:36:26 -0400 (EDT) Received: from John-Baldwins-Macbook-Pro.local (75-48-78-116.lightspeed.cncrca.sbcglobal.net [75.48.78.116]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 504E08A03C; Wed, 11 Aug 2010 14:36:24 -0400 (EDT) Message-ID: <4C62EDA7.5070001@FreeBSD.org> Date: Wed, 11 Aug 2010 14:36:23 -0400 From: John Baldwin User-Agent: Thunderbird 2.0.0.24 (Macintosh/20100228) MIME-Version: 1.0 To: Will Andrews References: <201008110051.o7B0pp10084996@svn.freebsd.org> In-Reply-To: <201008110051.o7B0pp10084996@svn.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.0.1 (bigwig.baldwin.cx); Wed, 11 Aug 2010 14:36:24 -0400 (EDT) X-Virus-Scanned: clamav-milter 0.95.1 at bigwig.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.5 required=4.2 tests=AWL,BAYES_00,RDNS_DYNAMIC autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bigwig.baldwin.cx Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r211157 - in head/sys: modules modules/if_carp net netinet netinet6 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2010 18:36:27 -0000 Will Andrews wrote: > Author: will > Date: Wed Aug 11 00:51:50 2010 > New Revision: 211157 > URL: http://svn.freebsd.org/changeset/base/211157 > > Log: > Allow carp(4) to be loaded as a kernel module. Follow precedent set by > bridge(4), lagg(4) etc. and make use of function pointers and > pf_proto_register() to hook carp into the network stack. > > Currently, because of the uncertainty about whether the unload path is free > of race condition panics, unloads are disallowed by default. Compiling with > CARPMOD_CAN_UNLOAD in CFLAGS removes this anti foot shooting measure. > > This commit requires IP6PROTOSPACER, introduced in r211115. This doesn't compile due to duplicate function pointer definitions (e.g. if_bridge.c and if_ether.c). You should move all the function pointer definitions to net/if.c and add declarations for them to a header instead of a bunch of 'extern' declarations in if_carp.c itself. -- John Baldwin