aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/marvell
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/marvell')
-rw-r--r--drivers/net/ethernet/marvell/mv643xx_eth.c4
-rw-r--r--drivers/net/ethernet/marvell/pxa168_eth.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 04d901d0ff63..ec85bf1bffd1 100644
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -1894,7 +1894,7 @@ static int rxq_init(struct mv643xx_eth_private *mp, int index)
1894 goto out_free; 1894 goto out_free;
1895 } 1895 }
1896 1896
1897 rx_desc = (struct rx_desc *)rxq->rx_desc_area; 1897 rx_desc = rxq->rx_desc_area;
1898 for (i = 0; i < rxq->rx_ring_size; i++) { 1898 for (i = 0; i < rxq->rx_ring_size; i++) {
1899 int nexti; 1899 int nexti;
1900 1900
@@ -1999,7 +1999,7 @@ static int txq_init(struct mv643xx_eth_private *mp, int index)
1999 1999
2000 txq->tx_desc_area_size = size; 2000 txq->tx_desc_area_size = size;
2001 2001
2002 tx_desc = (struct tx_desc *)txq->tx_desc_area; 2002 tx_desc = txq->tx_desc_area;
2003 for (i = 0; i < txq->tx_ring_size; i++) { 2003 for (i = 0; i < txq->tx_ring_size; i++) {
2004 struct tx_desc *txd = tx_desc + i; 2004 struct tx_desc *txd = tx_desc + i;
2005 int nexti; 2005 int nexti;
diff --git a/drivers/net/ethernet/marvell/pxa168_eth.c b/drivers/net/ethernet/marvell/pxa168_eth.c
index 1db023b075a1..59489722e898 100644
--- a/drivers/net/ethernet/marvell/pxa168_eth.c
+++ b/drivers/net/ethernet/marvell/pxa168_eth.c
@@ -1032,7 +1032,7 @@ static int rxq_init(struct net_device *dev)
1032 } 1032 }
1033 memset((void *)pep->p_rx_desc_area, 0, size); 1033 memset((void *)pep->p_rx_desc_area, 0, size);
1034 /* initialize the next_desc_ptr links in the Rx descriptors ring */ 1034 /* initialize the next_desc_ptr links in the Rx descriptors ring */
1035 p_rx_desc = (struct rx_desc *)pep->p_rx_desc_area; 1035 p_rx_desc = pep->p_rx_desc_area;
1036 for (i = 0; i < rx_desc_num; i++) { 1036 for (i = 0; i < rx_desc_num; i++) {
1037 p_rx_desc[i].next_desc_ptr = pep->rx_desc_dma + 1037 p_rx_desc[i].next_desc_ptr = pep->rx_desc_dma +
1038 ((i + 1) % rx_desc_num) * sizeof(struct rx_desc); 1038 ((i + 1) % rx_desc_num) * sizeof(struct rx_desc);
@@ -1095,7 +1095,7 @@ static int txq_init(struct net_device *dev)
1095 } 1095 }
1096 memset((void *)pep->p_tx_desc_area, 0, pep->tx_desc_area_size); 1096 memset((void *)pep->p_tx_desc_area, 0, pep->tx_desc_area_size);
1097 /* Initialize the next_desc_ptr links in the Tx descriptors ring */ 1097 /* Initialize the next_desc_ptr links in the Tx descriptors ring */
1098 p_tx_desc = (struct tx_desc *)pep->p_tx_desc_area; 1098 p_tx_desc = pep->p_tx_desc_area;
1099 for (i = 0; i < tx_desc_num; i++) { 1099 for (i = 0; i < tx_desc_num; i++) {
1100 p_tx_desc[i].next_desc_ptr = pep->tx_desc_dma + 1100 p_tx_desc[i].next_desc_ptr = pep->tx_desc_dma +
1101 ((i + 1) % tx_desc_num) * sizeof(struct tx_desc); 1101 ((i + 1) % tx_desc_num) * sizeof(struct tx_desc);