Date: Fri, 25 Dec 2009 14:59:54 +0000 (UTC) From: Luigi Rizzo <luigi@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r200986 - user/luigi/ipfw3-head/sys/netinet/ipfw Message-ID: <200912251459.nBPExsDq064113@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: luigi Date: Fri Dec 25 14:59:54 2009 New Revision: 200986 URL: http://svn.freebsd.org/changeset/base/200986 Log: remove unnecessary dependencies. The info from ng_ipfw and dummynet tags is handled in ip_fw_pfil.c, and the same should be done for divert. Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw2.c Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw2.c ============================================================================== --- user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw2.c Fri Dec 25 14:59:10 2009 (r200985) +++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw2.c Fri Dec 25 14:59:54 2009 (r200986) @@ -75,7 +75,6 @@ __FBSDID("$FreeBSD$"); #include <netinet/ip_fw.h> #include <netinet/ipfw/ip_fw_private.h> #include <netinet/ip_divert.h> -#include <netinet/ip_dummynet.h> #include <netinet/ip_carp.h> #include <netinet/pim.h> #include <netinet/tcp_var.h> @@ -83,8 +82,6 @@ __FBSDID("$FreeBSD$"); #include <netinet/udp_var.h> #include <netinet/sctp.h> -#include <netgraph/ng_ipfw.h> - #include <netinet/ip6.h> #include <netinet/icmp6.h> #ifdef INET6 @@ -1149,6 +1146,7 @@ do { \ IPFW_RUNLOCK(chain); return (IP_FW_PASS); /* accept */ } + /* XXX divert should be handled same as other tags */ mtag = m_tag_find(m, PACKET_TAG_DIVERT, NULL); if (args->slot) { /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912251459.nBPExsDq064113>