PERFORCE change 108190 for review

[Matt Jacob]

http://perforce.freebsd.org/chv.cgi?CH=108190

Change 108190 by mjacob at newisp on 2006/10/20 20:52:59

	IFC

Affected files ...

.. //depot/projects/newisp/netinet/ip_fw_pfil.c#2 integrate
.. //depot/projects/newisp/netinet/ip_input.c#2 integrate

Differences ...

==== //depot/projects/newisp/netinet/ip_fw_pfil.c#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.21 2006/05/12 04:41:27 mlaier Exp $
+ * $FreeBSD: src/sys/netinet/ip_fw_pfil.c,v 1.22 2006/10/20 19:32:08 julian Exp $
  */
 
 #if !defined(KLD_MODULE)
@@ -80,6 +80,14 @@
 /* ng_ipfw hooks. */
 ng_ipfw_input_t *ng_ipfw_input_p = NULL;
 
+/*
+ * ipfw_ether and ipfw_bridge hooks.
+ * XXX: Temporary until those are converted to pfil_hooks as well.
+ */
+ip_fw_chk_t *ip_fw_chk_ptr = NULL;
+ip_dn_io_t *ip_dn_io_ptr = NULL;
+int fw_one_pass = 1;
+
 /* Forward declarations. */
 static int	ipfw_divert(struct mbuf **, int, int);
 #define	DIV_DIR_IN	1

==== //depot/projects/newisp/netinet/ip_input.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/netinet/ip_input.c,v 1.320 2006/08/17 00:37:03 julian Exp $
+ * $FreeBSD: src/sys/netinet/ip_input.c,v 1.321 2006/10/20 19:32:08 julian Exp $
  */
 
 #include "opt_bootp.h"
@@ -77,10 +77,6 @@
 
 #include <sys/socketvar.h>
 
-/* XXX: Temporary until ipfw_ether and ipfw_bridge are converted. */
-#include <netinet/ip_fw.h>
-#include <netinet/ip_dummynet.h>
-
 int rsvp_on = 0;
 
 int	ipforwarding = 0;
@@ -192,14 +188,6 @@
     &ipstealth, 0, "");
 #endif
 
-/*
- * ipfw_ether and ipfw_bridge hooks.
- * XXX: Temporary until those are converted to pfil_hooks as well.
- */
-ip_fw_chk_t *ip_fw_chk_ptr = NULL;
-ip_dn_io_t *ip_dn_io_ptr = NULL;
-int fw_one_pass = 1;
-
 static void	ip_freef(struct ipqhead *, struct ipq *);
 
 /*