From 3f0ebb222003c7a0191fb07c9695562414123a5a Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Thu, 30 Oct 1997 15:39:56 +0000
Subject: [PATCH] sigh.  merge ipfilter 3.2 onto the trunk.  merge to the
 branch was a mistake.

---
 sys/lkm/netinet/if_ipl/ipl.h     |  6 +++---
 sys/lkm/netinet/if_ipl/mln_ipl.c | 19 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/sys/lkm/netinet/if_ipl/ipl.h b/sys/lkm/netinet/if_ipl/ipl.h
index ca775f2f4510..3c0b90040638 100644
--- a/sys/lkm/netinet/if_ipl/ipl.h
+++ b/sys/lkm/netinet/if_ipl/ipl.h
@@ -1,7 +1,7 @@
-/*	$NetBSD: ipl.h,v 1.7 1997/09/21 18:03:58 veego Exp $	*/
+/*	$NetBSD: ipl.h,v 1.8 1997/10/30 15:39:56 mrg Exp $	*/
 
 /*
- * (C)opyright 1993-1997 by Darren Reed.
+ * Copyright (C) 1993-1997 by Darren Reed.
  *
  * Redistribution and use in source and binary forms are permitted
  * provided that this notice is preserved and due credit is given
@@ -13,6 +13,6 @@
 #ifndef	__IPL_H__
 #define	__IPL_H__
 
-#define	IPL_VERSION	"IP Filter v3.2beta5"
+#define	IPL_VERSION	"IP Filter v3.2"
 
 #endif
diff --git a/sys/lkm/netinet/if_ipl/mln_ipl.c b/sys/lkm/netinet/if_ipl/mln_ipl.c
index a3915229a844..cb8ced0a4636 100644
--- a/sys/lkm/netinet/if_ipl/mln_ipl.c
+++ b/sys/lkm/netinet/if_ipl/mln_ipl.c
@@ -1,7 +1,7 @@
-/*	$NetBSD: mln_ipl.c,v 1.16 1997/09/21 18:04:00 veego Exp $	*/
+/*	$NetBSD: mln_ipl.c,v 1.17 1997/10/30 15:39:56 mrg Exp $	*/
 
 /*
- * (C)opyright 1993,1994,1995 by Darren Reed.
+ * Copyright (C) 1993-1997 by Darren Reed.
  *
  * Redistribution and use in source and binary forms are permitted
  * provided that this notice is preserved and due credit is given
@@ -59,14 +59,14 @@
 #define	MIN(a,b)	(((a)<(b))?(a):(b))
 #endif
 
-#ifdef NETBSD_PF
-#include <net/pfil.h>
-#endif
-
 
 extern	int	lkmenodev __P((void));
 
+#if NetBSD >= 199706
 int	if_ipl_lkmentry __P((struct lkm_table *, int, int));
+#else
+int	xxxinit __P((struct lkm_table *, int, int));
+#endif
 static	int	ipl_unload __P((void));
 static	int	ipl_load __P((void));
 static	int	ipl_remove __P((void));
@@ -115,8 +115,11 @@ extern struct cdevsw cdevsw[];
 extern int nchrdev;
 
 
-int
-if_ipl_lkmentry(lkmtp, cmd, ver)
+#if NetBSD >= 199706
+int if_ipl_lkmentry(lkmtp, cmd, ver)
+#else
+int xxxinit(lkmtp, cmd, ver)
+#endif
 struct lkm_table *lkmtp;
 int cmd, ver;
 {