summaryrefslogtreecommitdiff
path: root/sys/net
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2001-01-17 04:47:19 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2001-01-17 04:47:19 +0000
commit4c2f6e4f5fcdd3dd6e4318cbe93f5e67c3673e8c (patch)
tree01a426346aace2e6b14e001d1276f0f17e3703e2 /sys/net
parent5e7b102be725a3da894e929575e0b29d80c846e2 (diff)
IPF 3.4.15. (IPv6 not working yet).
Note: before building the userland part you need to do make includes.
Diffstat (limited to 'sys/net')
-rw-r--r--sys/net/bridgestp.c4
-rw-r--r--sys/net/if.c6
-rw-r--r--sys/net/if_bridge.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 234be26bd34..c1757150cd3 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bridgestp.c,v 1.2 2000/12/18 03:38:56 mickey Exp $ */
+/* $OpenBSD: bridgestp.c,v 1.3 2001/01/17 04:47:18 fgsch Exp $ */
/*
* Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -65,7 +65,7 @@
#include <netinet/if_ether.h>
#ifdef IPFILTER
-#include <netinet/ip_fil_compat.h>
+#include <netinet/ip_compat.h>
#include <netinet/ip_fil.h>
#endif
#endif
diff --git a/sys/net/if.c b/sys/net/if.c
index 907ec88b903..7e9182f3b7d 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if.c,v 1.38 2000/10/07 03:43:16 itojun Exp $ */
+/* $OpenBSD: if.c,v 1.39 2001/01/17 04:47:18 fgsch Exp $ */
/* $NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $ */
/*
@@ -104,7 +104,7 @@
#endif
#ifdef IPFILTER
-#include <netinet/ip_fil_compat.h>
+#include <netinet/ip_compat.h>
#include <netinet/ip_fil.h>
#include <netinet/ip_nat.h>
#endif
@@ -374,7 +374,7 @@ if_detach(ifp)
#ifdef IPFILTER
/* XXX More ipf & ipnat cleanup needed. */
- nat_ifdetach(ifp);
+ nat_clearlist();
#endif
/* Deallocate private resources. */
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 5b24f22dc96..21dcd2769ac 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.c,v 1.44 2000/12/30 22:56:23 angelos Exp $ */
+/* $OpenBSD: if_bridge.c,v 1.45 2001/01/17 04:47:18 fgsch Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -64,7 +64,7 @@
#include <net/if_enc.h>
#ifdef IPFILTER
-#include <netinet/ip_fil_compat.h>
+#include <netinet/ip_compat.h>
#include <netinet/ip_fil.h>
#endif
#endif