Nanako/openwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ar71xx: fix build with ag71xx debugfs support enabled

Browse Source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2018-02-28 13:57:58 +01:00
parent 13224f8b73
commit 36fb0697e2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c
View File

@ -175,8 +175,8 @@ static ssize_t read_file_ring(struct file *file, char __user *user_buf,
return -ENOMEM; return -ENOMEM;
len += snprintf(buf + len, buflen - len, len += snprintf(buf + len, buflen - len,
"Idx ... %-8s %-8s %-8s %-8s . %-10s\n", "Idx ... %-8s %-8s %-8s %-8s .\n",
"desc", "next", "data", "ctrl", "timestamp"); "desc", "next", "data", "ctrl");
spin_lock_irqsave(&ag->lock, flags); spin_lock_irqsave(&ag->lock, flags);
@ -184,12 +184,11 @@ static ssize_t read_file_ring(struct file *file, char __user *user_buf,
dirty = (ring->dirty & ring_mask); dirty = (ring->dirty & ring_mask);
desc_hw = ag71xx_rr(ag, desc_reg); 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); struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i);
u32 desc_dma = ((u32) ring->descs_dma) + i * AG71XX_DESC_SIZE; u32 desc_dma = ((u32) ring->descs_dma) + i * AG71XX_DESC_SIZE;
len += snprintf(buf + len, buflen - len, len += snprintf(buf + len, buflen - len,
"%3d %c%c%c %08x %08x %08x %08x %c %10lu\n", "%3d %c%c%c %08x %08x %08x %08x %c\n",
i, i,
(i == curr) ? 'C' : ' ', (i == curr) ? 'C' : ' ',
(i == dirty) ? 'D' : ' ', (i == dirty) ? 'D' : ' ',
@ -198,8 +197,7 @@ static ssize_t read_file_ring(struct file *file, char __user *user_buf,
desc->next, desc->next,
desc->data, desc->data,
desc->ctrl, desc->ctrl,
(desc->ctrl & DESC_EMPTY) ? 'E' : '*', (desc->ctrl & DESC_EMPTY) ? 'E' : '*');
ab->timestamp);
} }
spin_unlock_irqrestore(&ag->lock, flags); spin_unlock_irqrestore(&ag->lock, flags);