Author: nbd Date: 2016-02-11 23:48:36 +0100 (Thu, 11 Feb 2016) New Revision: 48695
Modified: trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c Log: ag71xx: fix build error with debugfs code Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c =================================================================== --- trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c 2016-02-11 15:02:07 UTC (rev 48694) +++ trunk/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c 2016-02-11 22:48:36 UTC (rev 48695) @@ -157,6 +157,8 @@ struct ag71xx_ring *ring, unsigned desc_reg) { + int ring_size = BIT(ring->order); + int ring_mask = ring_size - 1; char *buf; unsigned int buflen; unsigned int len = 0; @@ -167,7 +169,7 @@ u32 desc_hw; int i; - buflen = (ring->size * DESC_PRINT_LEN); + buflen = (ring_size * DESC_PRINT_LEN); buf = kmalloc(buflen, GFP_KERNEL); if (!buf) return -ENOMEM; @@ -178,13 +180,13 @@ spin_lock_irqsave(&ag->lock, flags); - curr = (ring->curr % ring->size); - dirty = (ring->dirty % ring->size); + curr = (ring->curr & ring_mask); + dirty = (ring->dirty & ring_mask); desc_hw = ag71xx_rr(ag, desc_reg); - for (i = 0; i < ring->size; i++) { + for (i = 0; i < ring_size; i++) { struct ag71xx_buf *ab = &ring->buf[i]; struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i); - u32 desc_dma = ((u32) ring->descs_dma) + i * ring->desc_size; + u32 desc_dma = ((u32) ring->descs_dma) + i * AG71XX_DESC_SIZE; len += snprintf(buf + len, buflen - len, "%3d %c%c%c %08x %08x %08x %08x %c %10lu\n", _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
