svn commit: r200580 - in head/sys: conf net netinet netinet/ipfw

[M. Warner Losh]

In message: <20091215.201621.756168950458235997.imp at bsdimp.com>
            "M. Warner Losh" <imp at bsdimp.com> writes:
: In message: <200912151615.nBFGFEOq068598 at svn.freebsd.org>
:             Luigi Rizzo <luigi at FreeBSD.org> writes:
: : Log:
: :   Start splitting ip_fw2.c and ip_fw.h into smaller components.
: :   At this time we pull out from ip_fw2.c the logging functions, and
: :   support for dynamic rules, and move kernel-only stuff into
: :   netinet/ipfw/ip_fw_private.h
: :   
: :   No ABI change involved in this commit, unless I made some mistake.
: :   ip_fw.h has changed, though not in the userland-visible part.
: ...
: :   netinet/ipfw/ip_fw_nat.c
: :   	minor rearrangement to remove LOOKUP_NAT from the
: :   	main headers. This require a new function pointer.
: 
: This broke the build.
: 
: Here's the fix:
: 
: Index: sys/netinet/ipfw/ip_fw_nat.c
: ===================================================================
: --- sys/netinet/ipfw/ip_fw_nat.c	(revision 200593)
: +++ sys/netinet/ipfw/ip_fw_nat.c	(working copy)
: @@ -70,12 +70,6 @@
:  static VNET_DEFINE(eventhandler_tag, ifaddr_event_tag);
:  #define	V_ifaddr_event_tag	VNET(ifaddr_event_tag)
:  
: -extern ipfw_nat_t *ipfw_nat_ptr;
: -extern ipfw_nat_cfg_t *ipfw_nat_cfg_ptr;
: -extern ipfw_nat_cfg_t *ipfw_nat_del_ptr;
: -extern ipfw_nat_cfg_t *ipfw_nat_get_cfg_ptr;
: -extern ipfw_nat_cfg_t *ipfw_nat_get_log_ptr;
: -
:  static void 
:  ifaddr_change(void *arg __unused, struct ifnet *ifp)
:  {

I committed this fix.  If there's a problem, feel free to back it out.

Warner