Commit 01534a45 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jeff Garzik

[PATCH] fix compiler warnings in mv64340_eth

parent ac09c578
...@@ -752,9 +752,8 @@ static int ether_init_rx_desc_ring(struct mv64340_private * mp, ...@@ -752,9 +752,8 @@ static int ether_init_rx_desc_ring(struct mv64340_private * mp,
p_rx_desc[i].byte_cnt = 0x0000; p_rx_desc[i].byte_cnt = 0x0000;
p_rx_desc[i].cmd_sts = p_rx_desc[i].cmd_sts =
ETH_BUFFER_OWNED_BY_DMA | ETH_RX_ENABLE_INTERRUPT; ETH_BUFFER_OWNED_BY_DMA | ETH_RX_ENABLE_INTERRUPT;
p_rx_desc[i].next_desc_ptr = p_rx_desc[i].next_desc_ptr = mp->rx_desc_dma +
(struct eth_rx_desc *) mp->rx_desc_dma + ((i + 1) % rx_desc_num) * sizeof(struct eth_rx_desc);
(i + 1) % rx_desc_num;
p_rx_desc[i].buf_ptr = buffer_addr; p_rx_desc[i].buf_ptr = buffer_addr;
mp->rx_skb[i] = NULL; mp->rx_skb[i] = NULL;
...@@ -818,9 +817,8 @@ static int ether_init_tx_desc_ring(struct mv64340_private *mp) ...@@ -818,9 +817,8 @@ static int ether_init_tx_desc_ring(struct mv64340_private *mp)
p_tx_desc[i].byte_cnt = 0x0000; p_tx_desc[i].byte_cnt = 0x0000;
p_tx_desc[i].l4i_chk = 0x0000; p_tx_desc[i].l4i_chk = 0x0000;
p_tx_desc[i].cmd_sts = 0x00000000; p_tx_desc[i].cmd_sts = 0x00000000;
p_tx_desc[i].next_desc_ptr = p_tx_desc[i].next_desc_ptr = mp->tx_desc_dma +
(struct eth_tx_desc *) mp->tx_desc_dma + ((i + 1) % tx_desc_num) * sizeof(struct eth_tx_desc);
(i + 1) % tx_desc_num;
p_tx_desc[i].buf_ptr = 0x00000000; p_tx_desc[i].buf_ptr = 0x00000000;
mp->tx_skb[i] = NULL; mp->tx_skb[i] = NULL;
} }
...@@ -2351,8 +2349,8 @@ static ETH_FUNC_RET_STATUS eth_port_send(struct mv64340_private * mp, ...@@ -2351,8 +2349,8 @@ static ETH_FUNC_RET_STATUS eth_port_send(struct mv64340_private * mp,
first_descriptor->cmd_sts = command_status; first_descriptor->cmd_sts = command_status;
first_descriptor->byte_cnt = p_pkt_info->byte_cnt; first_descriptor->byte_cnt = p_pkt_info->byte_cnt;
first_descriptor->buf_ptr = p_pkt_info->buf_ptr; first_descriptor->buf_ptr = p_pkt_info->buf_ptr;
first_descriptor->next_desc_ptr = first_descriptor->next_desc_ptr = mp->tx_desc_dma +
(struct eth_tx_desc *) mp->tx_desc_dma + tx_next_desc; tx_next_desc * sizeof(struct eth_tx_desc);
wmb(); wmb();
} else { } else {
tx_first_desc = mp->tx_first_desc_q; tx_first_desc = mp->tx_first_desc_q;
...@@ -2365,8 +2363,8 @@ static ETH_FUNC_RET_STATUS eth_port_send(struct mv64340_private * mp, ...@@ -2365,8 +2363,8 @@ static ETH_FUNC_RET_STATUS eth_port_send(struct mv64340_private * mp,
current_descriptor->next_desc_ptr = 0x00000000; current_descriptor->next_desc_ptr = 0x00000000;
else { else {
command_status |= ETH_BUFFER_OWNED_BY_DMA; command_status |= ETH_BUFFER_OWNED_BY_DMA;
current_descriptor->next_desc_ptr = current_descriptor->next_desc_ptr = mp->tx_desc_dma +
(struct eth_tx_desc *) mp->tx_desc_dma + tx_next_desc; tx_next_desc * sizeof(struct eth_tx_desc);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment