summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2019-03-22 02:23:07 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2019-03-22 02:23:07 +0000
commit1cfd4cb4677ec7bcea1bbe1f80cf9a7452d58ae5 (patch)
tree24930279af2fbea447ee58bcd37f435f1c0f5f8b
parentb579bc8e9a5fdfee791e5520a1537981344724e9 (diff)
back out 1.28
i misread the doco, having promisc vlan reception is what we want.
-rw-r--r--sys/dev/pci/if_ixl.c9
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");