summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorniklas <niklas@openbsd.org>2000-02-19 08:59:04 +0000
committerniklas <niklas@openbsd.org>2000-02-19 08:59:04 +0000
commit3f5510bc597db348d6e3574eb28fa09aba170351 (patch)
tree282b1d1c3909493ff91ddf6f1d0106331a17b09c
parentNo need to call memerr4_4c through a pointer. We know when we are a 4/4c. (diff)
downloadwireguard-openbsd-3f5510bc597db348d6e3574eb28fa09aba170351.tar.xz
wireguard-openbsd-3f5510bc597db348d6e3574eb28fa09aba170351.zip
set interface fields to null when detaching substructures
in preparation for softc retainment.
-rw-r--r--sys/net/bpf.c3
-rw-r--r--sys/net/if_bridge.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 64129212b3e..c26a30b9d71 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bpf.c,v 1.18 1999/08/10 02:42:30 deraadt Exp $ */
+/* $OpenBSD: bpf.c,v 1.19 2000/02/19 08:59:04 niklas Exp $ */
/* $NetBSD: bpf.c,v 1.33 1997/02/21 23:59:35 thorpej Exp $ */
/*
@@ -1390,6 +1390,7 @@ bpfdetach(ifp)
}
pbp = &bp->bif_next;
}
+ ifp->if_bpf = NULL;
}
#if BSD >= 199103
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 51b76ba0ddc..1ce9c96cdd6 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.c,v 1.25 2000/01/25 22:06:27 jason Exp $ */
+/* $OpenBSD: if_bridge.c,v 1.26 2000/02/19 08:59:05 niklas Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -556,6 +556,7 @@ bridge_ifdetach(ifp)
bridge_rtdelete(bsc, ifp);
bridge_flushrule(bif);
free(bif, M_DEVBUF);
+ ifp->if_bridge = NULL;
break;
}
}