diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2016-05-23 15:22:46 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2016-05-23 15:22:46 +0000 |
| commit | 8edbf305d54e4f20446f8c2bc0b4cbe9317af367 (patch) | |
| tree | b968a9dbe0a2c69b9fc27030b99c9327dd87ab1c /sys/arch | |
| parent | 930ffb11c330d96ed42b6192bccfc7381bfd4c14 (diff) | |
remove the function pointer from mbufs. this memory is shared with data
via unions, and we don't want to make it easy to control the target.
instead an integer index into an array of acceptable functions is used.
drivers using custom functions must register them to receive an index.
ok deraadt
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/octeon/dev/if_cnmac.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sys/arch/octeon/dev/if_cnmac.c b/sys/arch/octeon/dev/if_cnmac.c index e8625d83b85..5240737e864 100644 --- a/sys/arch/octeon/dev/if_cnmac.c +++ b/sys/arch/octeon/dev/if_cnmac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_cnmac.c,v 1.45 2016/05/21 11:04:38 visa Exp $ */ +/* $OpenBSD: if_cnmac.c,v 1.46 2016/05/23 15:22:45 tedu Exp $ */ /* * Copyright (c) 2007 Internet Initiative Japan, Inc. @@ -138,8 +138,6 @@ void octeon_eth_send_queue_del(struct octeon_eth_softc *, struct mbuf **, uint64_t **); int octeon_eth_buf_free_work(struct octeon_eth_softc *, uint64_t *, uint64_t); -void octeon_eth_buf_ext_free_m(caddr_t, u_int, void *); -void octeon_eth_buf_ext_free_ext(caddr_t, u_int, void *); int octeon_eth_ioctl(struct ifnet *, u_long, caddr_t); void octeon_eth_watchdog(struct ifnet *); @@ -212,6 +210,8 @@ struct cn30xxfpa_buf *octeon_eth_pools[8/* XXX */]; uint64_t octeon_eth_mac_addr = 0; uint32_t octeon_eth_mac_addr_offset = 0; +static u_int octeon_ext_free_idx; + void octeon_eth_buf_init(struct octeon_eth_softc *sc) { @@ -253,6 +253,10 @@ octeon_eth_attach(struct device *parent, struct device *self, void *aux) struct ifnet *ifp = &sc->sc_arpcom.ac_if; uint8_t enaddr[ETHER_ADDR_LEN]; + if (octeon_ext_free_idx == 0) + octeon_ext_free_idx = + mextfree_register(octeon_eth_buf_ext_free); + sc->sc_regt = ga->ga_regt; sc->sc_dmat = ga->ga_dmat; sc->sc_port = ga->ga_portno; @@ -616,7 +620,7 @@ octeon_eth_send_queue_add(struct octeon_eth_softc *sc, struct mbuf *m, m->m_pkthdr.ph_cookie = gbuf; ml_enqueue(&sc->sc_sendq, m); - if (m->m_ext.ext_free != NULL) + if (m->m_ext.ext_free_fn != 0) sc->sc_ext_callback_cnt++; } @@ -631,7 +635,7 @@ octeon_eth_send_queue_del(struct octeon_eth_softc *sc, struct mbuf **rm, *rm = m; *rgbuf = m->m_pkthdr.ph_cookie; - if (m->m_ext.ext_free != NULL) { + if (m->m_ext.ext_free_fn != 0) { sc->sc_ext_callback_cnt--; OCTEON_ETH_KASSERT(sc->sc_ext_callback_cnt >= 0); } @@ -1158,7 +1162,7 @@ octeon_eth_recv_mbuf(struct octeon_eth_softc *sc, uint64_t *work, ext_size = OCTEON_POOL_SIZE_PKT; ext_buf = addr & ~(ext_size - 1); - MEXTADD(m, ext_buf, ext_size, 0, octeon_eth_buf_ext_free, NULL); + MEXTADD(m, ext_buf, ext_size, 0, octeon_ext_free_idx, NULL); m->m_data = (void *)addr; m->m_len = m->m_pkthdr.len = (word1 & PIP_WQE_WORD1_LEN) >> 48; |