diff options
| author |   dlg <dlg@openbsd.org> | 2019-03-22 02:23:06 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2019-03-22 02:23:06 +0000 |
| commit | b4a9eb13866c78d5f5101df35eb7fccf0790ee9d (patch) | |
| tree | b5c6dad7cfe1acd263fbe8e26d89073239c89b4b | |
| parent | use a cond in ixl_atq_exec to wait for a command to be completed. (diff) | |
| download | wireguard-openbsd-b4a9eb13866c78d5f5101df35eb7fccf0790ee9d.tar.xz wireguard-openbsd-b4a9eb13866c78d5f5101df35eb7fccf0790ee9d.zip | |
back out 1.28
i misread the doco, having promisc vlan reception is what we want.
| -rw-r--r-- | sys/dev/pci/if_ixl.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/pci/if_ixl.c b/sys/dev/pci/if_ixl.c index 0ffadbe2fd1..ba86777c66f 100644 --- a/sys/dev/pci/if_ixl.c +++ b/sys/dev/pci/if_ixl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ixl.c,v 1.30 2019/03/22 02:20:30 dlg Exp $ */ +/* $OpenBSD: if_ixl.c,v 1.31 2019/03/22 02:23:06 dlg Exp $ */ /* * Copyright (c) 2013-2015, Intel Corporation @@ -1953,16 +1953,17 @@ ixl_iff(struct ixl_softc *sc) iaq->iaq_opcode = htole16(IXL_AQ_OP_SET_VSI_PROMISC); param = (struct ixl_aq_vsi_promisc_param *)&iaq->iaq_param; - param->flags = htole16(IXL_AQ_VSI_PROMISC_FLAG_BCAST); + param->flags = htole16(IXL_AQ_VSI_PROMISC_FLAG_BCAST | + IXL_AQ_VSI_PROMISC_FLAG_VLAN); if (ISSET(ifp->if_flags, IFF_PROMISC)) { - SET(ifp->if_flags, IFF_ALLMULTI); param->flags |= htole16(IXL_AQ_VSI_PROMISC_FLAG_UCAST | IXL_AQ_VSI_PROMISC_FLAG_MCAST); } else if (ISSET(ifp->if_flags, IFF_ALLMULTI)) { param->flags |= htole16(IXL_AQ_VSI_PROMISC_FLAG_MCAST); } param->valid_flags = htole16(IXL_AQ_VSI_PROMISC_FLAG_UCAST | - IXL_AQ_VSI_PROMISC_FLAG_MCAST | IXL_AQ_VSI_PROMISC_FLAG_BCAST); + IXL_AQ_VSI_PROMISC_FLAG_MCAST | IXL_AQ_VSI_PROMISC_FLAG_BCAST | + IXL_AQ_VSI_PROMISC_FLAG_VLAN); param->seid = sc->sc_seid; ixl_atq_exec(sc, &iatq, "ixliff"); |