diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2012-08-07 17:16:27 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2012-08-07 17:16:27 +0000 |
| commit | ba1eb81e311300c704a8431167d958bbcbbadeb6 (patch) | |
| tree | ff70a24a29602ccb2a80baf32307c0a16b075598 /sys/dev | |
| parent | 1d3e24c48b263fbcfc8a1c0b0a0cb50cff37820e (diff) | |
a bit of cleanup and a tx delay tweak
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_oce.c | 11 | ||||
| -rw-r--r-- | sys/dev/pci/ocevar.h | 6 |
2 files changed, 7 insertions, 10 deletions
diff --git a/sys/dev/pci/if_oce.c b/sys/dev/pci/if_oce.c index 2d580578c4e..0fa51fe228f 100644 --- a/sys/dev/pci/if_oce.c +++ b/sys/dev/pci/if_oce.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_oce.c,v 1.4 2012/08/07 09:23:13 mikeb Exp $ */ +/* $OpenBSD: if_oce.c,v 1.5 2012/08/07 17:16:26 mikeb Exp $ */ /* * Copyright (c) 2012 Mike Belopuhov @@ -312,9 +312,10 @@ oce_attachhook(void *arg) oce_hw_intr_enable(sc); oce_arm_eq(sc, sc->eq[0]->eq_id, 0, TRUE, FALSE); - /* Send first mcc cmd and after that we get gracious - MCC notifications from FW - */ + /* + * Send first mcc cmd and after that we get gracious + * MCC notifications from FW + */ oce_first_mcc_cmd(sc); return; @@ -1402,8 +1403,6 @@ oce_attach_ifp(struct oce_softc *sc) #endif #endif - ifp->if_baudrate = IF_Gbps(10UL); - if_attach(ifp); ether_ifattach(ifp); diff --git a/sys/dev/pci/ocevar.h b/sys/dev/pci/ocevar.h index 56f25ac0217..dabf6aca781 100644 --- a/sys/dev/pci/ocevar.h +++ b/sys/dev/pci/ocevar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ocevar.h,v 1.4 2012/08/06 21:55:31 mikeb Exp $ */ +/* $OpenBSD: ocevar.h,v 1.5 2012/08/07 17:16:26 mikeb Exp $ */ /*- * Copyright (C) 2012 Emulex @@ -65,7 +65,7 @@ #define OCE_MAX_CQ OCE_MAX_RQ + OCE_MAX_WQ + 1 /* one MCC queue */ #define OCE_MAX_CQ_EQ 8 /* Max CQ that can attached to an EQ */ -#define OCE_DEFAULT_WQ_EQD 64 +#define OCE_DEFAULT_WQ_EQD 80 #define OCE_MAX_PACKET_Q 16 #define OCE_RQ_BUF_SIZE 2048 #define OCE_LSO_MAX_SIZE (64 * 1024) @@ -440,7 +440,6 @@ struct oce_eq { void *parent; void *cb_context; struct oce_ring *ring; - uint32_t ref_count; qstate_t qstate; struct oce_cq *cq[OCE_MAX_CQ_EQ]; int cq_valid; @@ -472,7 +471,6 @@ struct oce_cq { struct oce_ring *ring; qstate_t qstate; struct cq_config cq_cfg; - uint32_t ref_count; }; struct mq_config { |