diff options
| author |   dlg <dlg@openbsd.org> | 2019-07-05 01:24:56 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2019-07-05 01:24:56 +0000 |
| commit | dc3d0bfdb18a9438cb680b9b15adead0ede7b77c (patch) | |
| tree | 47f33181eb6a8245667bf321395fe296512640fc | |
| parent | add ac_trunkport to arpcom so trunks can coordinate owning an interface (diff) | |
| download | wireguard-openbsd-dc3d0bfdb18a9438cb680b9b15adead0ede7b77c.tar.xz wireguard-openbsd-dc3d0bfdb18a9438cb680b9b15adead0ede7b77c.zip | |
record when trunk takes over an interface by setting ac_trunkport
this will be used to prevent trunk and the upcoming aggr driver
from taking ownership of an Ethernet interface at the same time.
| -rw-r--r-- | sys/net/if_trunk.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sys/net/if_trunk.c b/sys/net/if_trunk.c index 63aa807468e..877be962783 100644 --- a/sys/net/if_trunk.c +++ b/sys/net/if_trunk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_trunk.c,v 1.140 2019/05/11 18:10:45 florian Exp $ */ +/* $OpenBSD: if_trunk.c,v 1.141 2019/07/05 01:24:56 dlg Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org> @@ -285,6 +285,7 @@ trunk_port_create(struct trunk_softc *tr, struct ifnet *ifp) { struct trunk_softc *tr_ptr; struct trunk_port *tp; + struct arpcom *ac0; int error = 0; /* Limit the maximal number of trunk ports */ @@ -299,6 +300,10 @@ trunk_port_create(struct trunk_softc *tr, struct ifnet *ifp) if (ifp->if_type != IFT_ETHER) return (EPROTONOSUPPORT); + ac0 = (struct arpcom *)ifp; + if (ac0->ac_trunkport != NULL) + return (EBUSY); + /* Take MTU from the first member port */ if (SLIST_EMPTY(&tr->tr_ports)) { if (tr->tr_ifflags & IFF_DEBUG) @@ -377,6 +382,7 @@ trunk_port_create(struct trunk_softc *tr, struct ifnet *ifp) if (tr->tr_port_create != NULL) error = (*tr->tr_port_create)(tp); + ac0->ac_trunkport = tp; /* Change input handler of the physical interface. */ if_ih_insert(ifp, trunk_input, tp); @@ -406,9 +412,11 @@ trunk_port_destroy(struct trunk_port *tp) struct trunk_softc *tr = (struct trunk_softc *)tp->tp_trunk; struct trunk_port *tp_ptr; struct ifnet *ifp = tp->tp_if; + struct arpcom *ac0 = (struct arpcom *)ifp; /* Restore previous input handler. */ if_ih_remove(ifp, trunk_input, tp); + ac0->ac_trunkport = NULL; /* Remove multicast addresses from this port */ trunk_ether_cmdmulti(tp, SIOCDELMULTI); |