X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fnet%2Fbfin_mac.c;h=42e208cfb60fcc79f0cd0fd1d565c3facf5543e8;hb=97598fcf10eba577622f3387eaecd43dd710da0d;hp=dcc781a46aeab5a431f02ba1800e99daea2efa9e;hpb=e67f46286440a53fb1d693152667ea3b1a6b3060;p=u-boot

diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index dcc781a46a..42e208cfb6 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -118,13 +118,10 @@ int bfin_EMAC_initialize(bd_t *bis)
 	return 0;
 }
 
-static int bfin_EMAC_send(struct eth_device *dev, volatile void *packet,
-			  int length)
+static int bfin_EMAC_send(struct eth_device *dev, void *packet, int length)
 {
 	int i;
 	int result = 0;
-	unsigned int *buf;
-	buf = (unsigned int *)packet;
 
 	if (length <= 0) {
 		printf("Ethernet: bad packet size: %d\n", length);
@@ -191,8 +188,7 @@ static int bfin_EMAC_recv(struct eth_device *dev)
 
 		debug("%s: len = %d\n", __func__, length - 4);
 
-		NetRxPackets[rxIdx] =
-		    (volatile uchar *)(rxbuf[rxIdx]->FrmData->Dest);
+		NetRxPackets[rxIdx] = rxbuf[rxIdx]->FrmData->Dest;
 		NetReceive(NetRxPackets[rxIdx], length - 4);
 		bfin_write_DMA1_IRQ_STATUS(DMA_DONE | DMA_ERR);
 		rxbuf[rxIdx]->StatusWord = 0x00000000;
@@ -263,6 +259,8 @@ static int bfin_miiphy_init(struct eth_device *dev, int *opmode)
 		*opmode = 0;
 
 	bfin_write_EMAC_MMC_CTL(RSTC | CROLL);
+	bfin_write_EMAC_VLAN1(EMAC_VLANX_DEF_VAL);
+	bfin_write_EMAC_VLAN2(EMAC_VLANX_DEF_VAL);
 
 	/* Initialize the TX DMA channel registers */
 	bfin_write_DMA2_X_COUNT(0);
@@ -471,7 +469,7 @@ int ether_post_test(int flags)
 	for (i = 0; i < 42; i++)
 		buf[i + 22] = i;
 	printf("--------Send 64 bytes......\n");
-	bfin_EMAC_send(NULL, (volatile void *)buf, 64);
+	bfin_EMAC_send(NULL, buf, 64);
 	for (i = 0; i < 100; i++) {
 		udelay(10000);
 		if ((rxbuf[rxIdx]->StatusWord & RX_COMP) != 0) {