leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

korina: Fix conflict with global symbol desc_empty on x86.

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2021-04-20 16:24:26 -07:00
parent ff254dad0e
commit 56e2e5de44
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/net/ethernet/korina.c
View File

@ -1,4 +1,4 @@
/* >/*
* Driver for the IDT RC32434 (Korina) on-chip ethernet controller. * Driver for the IDT RC32434 (Korina) on-chip ethernet controller.
* *
* Copyright 2004 IDT Inc. (rischelp@idt.com) * Copyright 2004 IDT Inc. (rischelp@idt.com)
@ -323,7 +323,7 @@ struct dma_reg {
enum chain_status { enum chain_status {
desc_filled, desc_filled,
desc_empty desc_is_empty
}; };
#define DMA_COUNT(count) ((count) & DMA_DESC_COUNT_MSK) #define DMA_COUNT(count) ((count) & DMA_DESC_COUNT_MSK)
@ -459,7 +459,7 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
chain_next = (idx + 1) & KORINA_TDS_MASK; chain_next = (idx + 1) & KORINA_TDS_MASK;
if (readl(&(lp->tx_dma_regs->dmandptr)) == 0) { if (readl(&(lp->tx_dma_regs->dmandptr)) == 0) {
if (lp->tx_chain_status == desc_empty) { if (lp->tx_chain_status == desc_is_empty) {
/* Update tail */ /* Update tail */
td->control = DMA_COUNT(length) | td->control = DMA_COUNT(length) |
DMA_DESC_COF | DMA_DESC_IOF; DMA_DESC_COF | DMA_DESC_IOF;
@ -486,10 +486,10 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
&lp->tx_dma_regs->dmandptr); &lp->tx_dma_regs->dmandptr);
/* Move head to tail */ /* Move head to tail */
lp->tx_chain_head = lp->tx_chain_tail; lp->tx_chain_head = lp->tx_chain_tail;
lp->tx_chain_status = desc_empty; lp->tx_chain_status = desc_is_empty;
} }
} else { } else {
if (lp->tx_chain_status == desc_empty) { if (lp->tx_chain_status == desc_is_empty) {
/* Update tail */ /* Update tail */
td->control = DMA_COUNT(length) | td->control = DMA_COUNT(length) |
DMA_DESC_COF | DMA_DESC_IOF; DMA_DESC_COF | DMA_DESC_IOF;
@ -868,7 +868,7 @@ korina_tx_dma_interrupt(int irq, void *dev_id)
(readl(&(lp->tx_dma_regs->dmandptr)) == 0)) { (readl(&(lp->tx_dma_regs->dmandptr)) == 0)) {
writel(korina_tx_dma(lp, lp->tx_chain_head), writel(korina_tx_dma(lp, lp->tx_chain_head),
&lp->tx_dma_regs->dmandptr); &lp->tx_dma_regs->dmandptr);
lp->tx_chain_status = desc_empty; lp->tx_chain_status = desc_is_empty;
lp->tx_chain_head = lp->tx_chain_tail; lp->tx_chain_head = lp->tx_chain_tail;
netif_trans_update(dev); netif_trans_update(dev);
} }
@ -999,7 +999,7 @@ static int korina_alloc_ring(struct net_device *dev)
} }
lp->tx_next_done = lp->tx_chain_head = lp->tx_chain_tail = lp->tx_next_done = lp->tx_chain_head = lp->tx_chain_tail =
lp->tx_full = lp->tx_count = 0; lp->tx_full = lp->tx_count = 0;
lp->tx_chain_status = desc_empty; lp->tx_chain_status = desc_is_empty;
/* Initialize the receive descriptors */ /* Initialize the receive descriptors */
for (i = 0; i < KORINA_NUM_RDS; i++) { for (i = 0; i < KORINA_NUM_RDS; i++) {
@ -1027,7 +1027,7 @@ static int korina_alloc_ring(struct net_device *dev)
lp->rx_next_done = 0; lp->rx_next_done = 0;
lp->rx_chain_head = 0; lp->rx_chain_head = 0;
lp->rx_chain_tail = 0; lp->rx_chain_tail = 0;
lp->rx_chain_status = desc_empty; lp->rx_chain_status = desc_is_empty;
return 0; return 0;
} }