summaryrefslogtreecommitdiffstats
path: root/sys/pci/if_tireg.h
diff options
context:
space:
mode:
authorbmilekic <bmilekic@FreeBSD.org>2000-10-21 00:13:35 +0000
committerbmilekic <bmilekic@FreeBSD.org>2000-10-21 00:13:35 +0000
commitdc0e61621e14874862edaf5a6b31ce14023d87cf (patch)
treeb48941d60bef2ec0f44bf64012be5efcd0f58aac /sys/pci/if_tireg.h
parent78015e935d99ffac32a52125b4d9d377377bca32 (diff)
downloadFreeBSD-src-dc0e61621e14874862edaf5a6b31ce14023d87cf.zip
FreeBSD-src-dc0e61621e14874862edaf5a6b31ce14023d87cf.tar.gz
(Introduce something sitting in my repo for 3 weeks now...)
Have if_ti stop "hiding" the softc pointer in the buffer region. Rather, use the available void * passed to the free routine and pass the softc pointer through there. To note: in MEXTADD(), TI_JUMBO_FRAMELEN should probably be TI_JLEN. I left it unchanged, because this way I'm sure to not damage anything in this respect...
Diffstat (limited to 'sys/pci/if_tireg.h')
-rw-r--r--sys/pci/if_tireg.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/pci/if_tireg.h b/sys/pci/if_tireg.h
index d64cc7a..0eaff14 100644
--- a/sys/pci/if_tireg.h
+++ b/sys/pci/if_tireg.h
@@ -1037,17 +1037,13 @@ struct ti_event_desc {
#define TI_MSLOTS 256
#define TI_JSLOTS 384
-#define TI_JRAWLEN (TI_JUMBO_FRAMELEN + ETHER_ALIGN + sizeof(u_int64_t))
+#define TI_JRAWLEN (TI_JUMBO_FRAMELEN + ETHER_ALIGN)
#define TI_JLEN (TI_JRAWLEN + (sizeof(u_int64_t) - \
(TI_JRAWLEN % sizeof(u_int64_t))))
#define TI_JPAGESZ PAGE_SIZE
#define TI_RESID (TI_JPAGESZ - (TI_JLEN * TI_JSLOTS) % TI_JPAGESZ)
#define TI_JMEM ((TI_JLEN * TI_JSLOTS) + TI_RESID)
-struct ti_jslot {
- caddr_t ti_buf;
-};
-
/*
* Ring structures. Most of these reside in host memory and we tell
* the NIC where they are via the ring control blocks. The exceptions
@@ -1087,7 +1083,7 @@ struct ti_chain_data {
struct mbuf *ti_rx_jumbo_chain[TI_JUMBO_RX_RING_CNT];
struct mbuf *ti_rx_mini_chain[TI_MINI_RX_RING_CNT];
/* Stick the jumbo mem management stuff here too. */
- struct ti_jslot ti_jslots[TI_JSLOTS];
+ caddr_t ti_jslots[TI_JSLOTS];
void *ti_jumbo_buf;
};
OpenPOWER on IntegriCloud