Date: Fri, 27 May 2016 22:14:39 +0000 (UTC) From: Ian Lepore <ian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r300878 - head/sys/dev/ffec Message-ID: <201605272214.u4RMEdE6080121@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ian Date: Fri May 27 22:14:39 2016 New Revision: 300878 URL: https://svnweb.freebsd.org/changeset/base/300878 Log: Fix erronious mixed use of tx/rx variables/constants in the same expression. Pointed out by jmcneill; other instances found by grep -iE 'rx.*tx|tx.*rx' Modified: head/sys/dev/ffec/if_ffec.c Modified: head/sys/dev/ffec/if_ffec.c ============================================================================== --- head/sys/dev/ffec/if_ffec.c Fri May 27 21:41:52 2016 (r300877) +++ head/sys/dev/ffec/if_ffec.c Fri May 27 22:14:39 2016 (r300878) @@ -173,7 +173,7 @@ struct ffec_softc { struct ffec_hwdesc *txdesc_ring; bus_addr_t txdesc_ring_paddr; bus_dma_tag_t txbuf_tag; - struct ffec_bufmap txbuf_map[RX_DESC_COUNT]; + struct ffec_bufmap txbuf_map[TX_DESC_COUNT]; uint32_t tx_idx_head; uint32_t tx_idx_tail; int txcount; @@ -896,9 +896,9 @@ ffec_rxfinish_locked(struct ffec_softc * } if (produced_empty_buffer) { - bus_dmamap_sync(sc->rxdesc_tag, sc->txdesc_map, BUS_DMASYNC_PREWRITE); + bus_dmamap_sync(sc->rxdesc_tag, sc->rxdesc_map, BUS_DMASYNC_PREWRITE); WR4(sc, FEC_RDAR_REG, FEC_RDAR_RDAR); - bus_dmamap_sync(sc->rxdesc_tag, sc->txdesc_map, BUS_DMASYNC_POSTWRITE); + bus_dmamap_sync(sc->rxdesc_tag, sc->rxdesc_map, BUS_DMASYNC_POSTWRITE); } }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605272214.u4RMEdE6080121>