summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2019-03-21 12:30:59 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2019-03-21 12:30:59 +0000
commit34595f18c316e0df1c72cf3d4f2fb10118006c35 (patch)
tree91b6376113ed4ec3db83586cc63f93dd2e596de5
parent9febd4fd2dec388be98310242f4498ff29280307 (diff)
don't set VLAN things when configuring promisc
the doco says vlan things should only be set if you're manipulating something on a specific vlan, otherwise the config applies to everything, which is how the stack wants things to work at the moment. there's still something wrong in here, but let's get this out of the way first.
-rw-r--r--sys/dev/pci/if_ixl.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/pci/if_ixl.c b/sys/dev/pci/if_ixl.c
index 8658430c5f5..6a3a5fe11d5 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.27 2019/03/21 11:50:20 dlg Exp $ */
+/* $OpenBSD: if_ixl.c,v 1.28 2019/03/21 12:30:58 dlg Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -1952,8 +1952,7 @@ 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 |
- IXL_AQ_VSI_PROMISC_FLAG_VLAN);
+ param->flags = htole16(IXL_AQ_VSI_PROMISC_FLAG_BCAST);
if (ISSET(ifp->if_flags, IFF_PROMISC)) {
SET(ifp->if_flags, IFF_ALLMULTI);
param->flags |= htole16(IXL_AQ_VSI_PROMISC_FLAG_UCAST |
@@ -1962,8 +1961,7 @@ ixl_iff(struct ixl_softc *sc)
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_VLAN);
+ IXL_AQ_VSI_PROMISC_FLAG_MCAST | IXL_AQ_VSI_PROMISC_FLAG_BCAST);
param->seid = sc->sc_seid;
ixl_atq_exec(sc, &iatq, "ixliff");