d1fcb86326
tabify
2003-06-26 00:43:31 +00:00
be084ba94f
vax -> __vax__. Didn't I fix this a year ago?
2003-03-05 13:19:59 +00:00
73fe03a9d6
Comment out the inclusion of <uvm/uvm_extern.h> -- the header is not
...
necessary.
2003-02-24 22:12:57 +00:00
b69124b84c
Resync with official IPF
2002-09-19 08:12:43 +00:00
87f18f024e
Upgraded IPFilter to 3.4.29
2002-09-19 08:08:14 +00:00
f192b66b94
whitespace
2002-06-09 16:33:36 +00:00
e74092de02
Upgraded IPFilter to 3.4.27
2002-05-02 17:11:37 +00:00
83b3487b70
Upgraded IPFilter to 3.4.25
2002-03-14 12:32:36 +00:00
7a8f11612c
Re-sync with IPFilter
2002-01-24 08:23:40 +00:00
b9920d0f43
Upgraded IPFilter to 3.4.23
2002-01-24 08:21:30 +00:00
7952ffd61f
defined(vax) -> defined(__vax__). This may fix PR#12919.
2001-05-26 21:29:45 +00:00
b978c269f5
Delete SPL_IMP(). It is not used in IP Filter, and it aids me
...
on my quest to eliminate the foul beast known as splimp.
2001-04-12 19:41:53 +00:00
fb2dc295a6
Resolve conflicts.
2001-03-26 06:11:46 +00:00
09cb38f22b
expose the definitions of MIN() and MAX() in sys/param.h to the kernel
...
and use those in favor of a dozen copies scattered around the source tree.
2001-02-05 10:42:40 +00:00
5ec6fd267b
remove include of <vm/vm.h>
2000-06-28 02:59:32 +00:00
2f159a1bac
remove/move more mach vm header files:
...
<vm/pglist.h> -> <uvm/uvm_pglist.h>
<vm/vm_inherit.h> -> <uvm/uvm_inherit.h>
<vm/vm_kern.h> -> into <uvm/uvm_extern.h>
<vm/vm_object.h> -> nothing
<vm/vm_pager.h> -> into <uvm/uvm_pager.h>
also includes a bunch of <vm/vm_page.h> include removals (due to redudancy
with <vm/vm.h>), and a scattering of other similar headers.
2000-06-26 14:20:25 +00:00
21dea2100c
Resolve conflicts.
2000-05-03 11:12:03 +00:00
64b2c34646
Resolve conflicts and small fixes.
1999-12-12 11:11:15 +00:00
78db9d7d95
merge ipf 3.2.10
1998-11-22 15:17:18 +00:00
97ab1bd53b
Resolve conflicts from the import.
1998-07-12 15:23:59 +00:00
a4c89e3e2e
Resolve conflicts from the import of IPFilter 3.2.7.
1998-05-29 20:24:36 +00:00
82423e3d01
Resolve conflicts
1998-05-17 16:50:15 +00:00
f73530ba55
add/cleanup multiple inclusion protection.
1998-02-10 01:26:19 +00:00
84ecff38c2
merge ip-filter 3.2.1
1997-11-14 12:40:06 +00:00
60c28e1f95
sigh. merge ipfilter 3.2 onto the trunk. merge to the branch was a mistake.
1997-10-30 16:08:54 +00:00
4508fb4354
Resolve conflicts from the merge of ipf 3.2beta5.
1997-09-21 18:00:54 +00:00
b19b36aff5
Restore original RCS IDs.
1997-07-06 05:29:13 +00:00
729f0dc597
fix conflicts from import
1997-07-05 05:38:14 +00:00
41d4822677
Resolve conflicts from merge of 3.2a7, take 2. Also, eliminate some
...
silly differences between the NetBSD copy of the code and the
vendor branch, keeping only those which are necessary. Of those
differences that currently exist, several "portability to NetBSD"
issues, which will be fed back to the ipfilter author.
1997-05-28 00:17:11 +00:00
29fab67628
fix conflicts
1997-05-25 12:40:11 +00:00
ae60a7c343
Fix SPLNET() conditional to work for NetBSD1_0+, not just the named versions.
1997-04-15 00:42:54 +00:00
f30d8f327f
Resolve conflicts from merge.
...
XXX !!! XXX !!!
I noticed a few semi-serious bugs while doing this merge, one of which
has existed for a fairly long time. Some of them are addressed in this
commit (because they caused the kernel to not compile), and are annoted
by "XXX" and "--thorpej". The other one will be addressed shortly in
a future commit, and, as far as I can tell, affects all operating systems
which IP Filter supports.
1997-03-29 00:54:55 +00:00
25bcda3b52
Add $NetBSD$ id's and restore the orginal Id's.
1997-01-05 21:32:17 +00:00
c1067a3f4b
initial import of darren reed's ip-filter, version 3.1.2.
1997-01-05 13:47:59 +00:00
itojun