Merge branch 'master' of git://git.denx.de/u-boot-mmc

[karo-tx-uboot.git] / drivers / net / bfin_mac.c

diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index c63398ebf8d1235fa7a187f825ae55db429e81b2..42e208cfb60fcc79f0cd0fd1d565c3facf5543e8 100644 (file)
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -122,8 +122,6 @@ 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);
@@ -261,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);