summaryrefslogtreecommitdiff
path: root/sys/net/if_bridge.h
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2019-11-07 07:36:33 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2019-11-07 07:36:33 +0000
commit37888cbb216c3b0a4b8628e4f5b1f49605c2ff56 (patch)
tree5bc0f3659b6a4221fc47f31b18711d577ca21d8c /sys/net/if_bridge.h
parent9b2b8e17cfdc462bd540a101c43c204770f2a3f3 (diff)
turn the linkstate hooks into a task list, like the detach hooks.
this is largely mechanical, except for carp. this moves the addition of the carp link state hook after we're committed to using the new interface as a carpdev. because the add can't fail, we avoid a complicated unwind dance. also, this tweaks the carp linkstate hook so it only updates the relevant carp interface, not all of the carpdevs on the parent. hrvoje popovski has tested an early version of this diff and it's generally ok, but there's some splasserts that this diff fires that i'll fix in an upcoming diff. ok claudio@
Diffstat (limited to 'sys/net/if_bridge.h')
-rw-r--r--sys/net/if_bridge.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_bridge.h b/sys/net/if_bridge.h
index 64393cf9ad2..3b0c5526647 100644
--- a/sys/net/if_bridge.h
+++ b/sys/net/if_bridge.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.h,v 1.66 2019/11/06 03:51:26 dlg Exp $ */
+/* $OpenBSD: if_bridge.h,v 1.67 2019/11/07 07:36:31 dlg Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -331,7 +331,7 @@ struct bstp_port {
LIST_ENTRY(bstp_port) bp_next;
struct ifnet *bp_ifp; /* parent if */
struct bstp_state *bp_bs;
- void *bp_lhcookie; /* if linkstate hook */
+ struct task bp_ltask; /* if linkstate hook */
u_int8_t bp_active;
u_int8_t bp_protover;
u_int32_t bp_flags;