Merge git://git.denx.de/u-boot-mpc85xx

[u-boot] / drivers / net / bcm-sf2-eth.c

diff --git a/drivers/net/bcm-sf2-eth.c b/drivers/net/bcm-sf2-eth.c
index 5252d49de9568b33669426f84bb386b6b520c337..e2747365a20b3d46389bb7384bc4c66e9de5c47c 100644 (file)
--- a/drivers/net/bcm-sf2-eth.c
+++ b/drivers/net/bcm-sf2-eth.c
@@ -103,7 +103,7 @@ static int bcm_sf2_eth_send(struct eth_device *dev, void *packet, int length)
 static int bcm_sf2_eth_receive(struct eth_device *dev)
 {
        struct eth_dma *dma = &(((struct eth_info *)(dev->priv))->dma);
-       uint8_t *buf = (uint8_t *)NetRxPackets[0];
+       uint8_t *buf = (uint8_t *)net_rx_packets[0];
        int rcvlen;
        int rc = 0;
        int i = 0;
@@ -124,11 +124,11 @@ static int bcm_sf2_eth_receive(struct eth_device *dev)
                        debug("recieved\n");
 
                        /* Forward received packet to uboot network handler */
-                       NetReceive(buf, rcvlen);
+                       net_process_received_packet(buf, rcvlen);
 
                        if (++i >= PKTBUFSRX)
                                i = 0;
-                       buf = NetRxPackets[i];
+                       buf = net_rx_packets[i];
                }
        }
 
@@ -154,12 +154,6 @@ static int bcm_sf2_eth_open(struct eth_device *dev, bd_t *bt)
 
        debug("Enabling BCM SF2 Ethernet.\n");
 
-       /* Set MAC address from env */
-       if (bcm_sf2_eth_write_hwaddr(dev) != 0) {
-               error("%s: MAC set error when opening !\n", __func__);
-               return -1;
-       }
-
        eth->enable_mac();
 
        /* enable tx and rx DMA */
@@ -250,7 +244,18 @@ int bcm_sf2_eth_register(bd_t *bis, u8 dev_num)
        eth_register(dev);
 
 #ifdef CONFIG_CMD_MII
-       miiphy_register(dev->name, eth->miiphy_read, eth->miiphy_write);
+       int retval;
+       struct mii_dev *mdiodev = mdio_alloc();
+
+       if (!mdiodev)
+               return -ENOMEM;
+       strncpy(mdiodev->name, dev->name, MDIO_NAME_LEN);
+       mdiodev->read = eth->miiphy_read;
+       mdiodev->write = eth->miiphy_write;
+
+       retval = mdio_register(mdiodev);
+       if (retval < 0)
+               return retval;
 #endif
 
        /* Initialization */