summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2017-11-28 23:47:26 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2017-11-28 23:47:26 +0000
commit019b77195e783e17553dbea31a06dfa588ff3ef3 (patch)
treeabbe6798ed049f1cf26e2916465ee2e4a68ddeb1 /sys
parent882e40da9d6f9871e92ac4fe0f76bcef95caed76 (diff)
remove the #if 0ed out ixl_add_veb now that cvs has backed it up
im pretty sure we dont need it if we're just using the chip as a single ethernet port.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/if_ixl.c54
1 files changed, 1 insertions, 53 deletions
diff --git a/sys/dev/pci/if_ixl.c b/sys/dev/pci/if_ixl.c
index 73579666bc4..9c100331317 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.1 2017/11/28 23:39:39 dlg Exp $ */
+/* $OpenBSD: if_ixl.c,v 1.2 2017/11/28 23:47:25 dlg Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -1085,9 +1085,6 @@ static int ixl_phy_mask_ints(struct ixl_softc *);
static int ixl_get_phy_abilities(struct ixl_softc *, uint64_t *);
static int ixl_restart_an(struct ixl_softc *);
static int ixl_hmc(struct ixl_softc *);
-#if 0
-static int ixl_add_veb(struct ixl_softc *);
-#endif
static int ixl_get_vsi(struct ixl_softc *);
static int ixl_set_vsi(struct ixl_softc *);
static int ixl_set_default_vsi(struct ixl_softc *);
@@ -1475,13 +1472,6 @@ ixl_attach(struct device *parent, struct device *self, void *aux)
goto shutdown;
}
-#if 0
- if (ixl_add_veb(sc) != 0) {
- /* error printed by ixl_add_veb */
- goto shutdown;
- }
-#endif
-
if (ixl_dmamem_alloc(sc, &sc->sc_vsi,
sizeof(struct ixl_aq_vsi_data), 8) != 0) {
printf("%s: unable to allocate VSI data\n", DEVNAME(sc));
@@ -3113,48 +3103,6 @@ ixl_get_link_status(struct ixl_softc *sc)
return (0);
}
-#if 0
-static int
-ixl_add_veb(struct ixl_softc *sc)
-{
- struct ixl_aq_desc iaq;
- struct ixl_aq_veb_param *param;
- struct ixl_aq_veb_reply *reply;
-
- memset(&iaq, 0, sizeof(iaq));
- iaq.iaq_opcode = htole16(IXL_AQ_OP_ADD_VEB);
-
- param = (struct ixl_aq_veb_param *)iaq.iaq_param;
- param->uplink_seid = sc->sc_uplink_seid;
- param->downlink_seid = sc->sc_downlink_seid;
- param->veb_flags = htole16(IXL_AQ_ADD_VEB_PORT_TYPE_DEFAULT |
- IXL_AQ_ADD_VEB_DISABLE_STATS);
- if (sc->sc_uplink_seid != htole16(0))
- param->veb_flags |= htole16(IXL_AQ_ADD_VEB_FLOATING);
- param->enable_tcs = 1;
-
- if (ixl_atq_poll(sc, &iaq, 250) != 0) {
- printf("%s: ADD VEB timeout\n", DEVNAME(sc));
- return (-1);
- }
- if (iaq.iaq_retval != htole16(IXL_AQ_RC_OK)) {
- printf("%s: ADD VEB error %u\n", DEVNAME(sc),
- lemtoh16(&iaq.iaq_retval));
- return (-1);
- }
-
- reply = (struct ixl_aq_veb_reply *)iaq.iaq_param;
- sc->sc_veb_seid = reply->veb_seid;
-
-#if 1
- printf("%s: vebs used %u free %u\n", DEVNAME(sc),
- lemtoh16(&reply->vebs_used), lemtoh16(&reply->vebs_free));
-#endif
-
- return (0);
-}
-#endif
-
static int
ixl_get_vsi(struct ixl_softc *sc)
{