1 files changed, 51 insertions, 29 deletions

diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 16a1d58419d..d9d14c83f51 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -1128,6 +1128,26 @@ static phy_info_t phy_info_dp83848= {
         },
 };
 
+static phy_info_t phy_info_lan8700 = {
+        0x0007C0C,
+        "LAN8700",
+        (const phy_cmd_t []) { /* config */
+                { mk_mii_read(MII_REG_CR), mii_parse_cr },
+                { mk_mii_read(MII_REG_ANAR), mii_parse_anar },
+                { mk_mii_end, }
+        },
+        (const phy_cmd_t []) { /* startup */
+                { mk_mii_write(MII_REG_CR, 0x1200), NULL }, /* autonegotiate */
+                { mk_mii_read(MII_REG_SR), mii_parse_sr },
+                { mk_mii_end, }
+        },
+        (const phy_cmd_t []) { /* act_int */
+                { mk_mii_end, }
+        },
+        (const phy_cmd_t []) { /* shutdown */
+                { mk_mii_end, }
+        },
+};
 /* ------------------------------------------------------------------------- */
 
 static phy_info_t const * const phy_info[] = {
@@ -1137,6 +1157,7 @@ static phy_info_t const * const phy_info[] = {
         &phy_info_am79c874,
         &phy_info_ks8721bl,
         &phy_info_dp83848,
+        &phy_info_lan8700,
         NULL
 };
 
@@ -1585,7 +1606,7 @@ static void set_multicast_list(struct net_device *dev)
 
         dmi = dev->mc_list;
 
-        for (j = 0; j < dev->mc_count; j++, dmi = dmi->next) {
+        for (j = 0; j < netdev_mc_count(dev); j++, dmi = dmi->next) {
                 /* Only support group multicast for now */
                 if (!(dmi->dmi_addr[0] & 1))
                         continue;
@@ -1658,6 +1679,7 @@ static int fec_enet_init(struct net_device *dev, int index)
 {
         struct fec_enet_private *fep = netdev_priv(dev);
         struct bufdesc *cbd_base;
+        struct bufdesc *bdp;
         int i;
 
         /* Allocate memory for buffer descriptors. */
@@ -1710,6 +1732,34 @@ static int fec_enet_init(struct net_device *dev, int index)
         /* Set MII speed to 2.5 MHz */
         fep->phy_speed = ((((clk_get_rate(fep->clk) / 2 + 4999999)
                                         / 2500000) / 2) & 0x3F) << 1;
+
+        /* Initialize the receive buffer descriptors. */
+        bdp = fep->rx_bd_base;
+        for (i = 0; i < RX_RING_SIZE; i++) {
+
+                /* Initialize the BD for every fragment in the page. */
+                bdp->cbd_sc = 0;
+                bdp++;
+        }
+
+        /* Set the last buffer to wrap */
+        bdp--;
+        bdp->cbd_sc |= BD_SC_WRAP;
+
+        /* ...and the same for transmit */
+        bdp = fep->tx_bd_base;
+        for (i = 0; i < TX_RING_SIZE; i++) {
+
+                /* Initialize the BD for every fragment in the page. */
+                bdp->cbd_sc = 0;
+                bdp->cbd_bufaddr = 0;
+                bdp++;
+        }
+
+        /* Set the last buffer to wrap */
+        bdp--;
+        bdp->cbd_sc |= BD_SC_WRAP;
+
         fec_restart(dev, 0);
 
         /* Queue up command to detect the PHY and initialize the
@@ -1730,7 +1780,6 @@ static void
 fec_restart(struct net_device *dev, int duplex)
 {
         struct fec_enet_private *fep = netdev_priv(dev);
-        struct bufdesc *bdp;
         int i;
 
         /* Whack a reset.  We should wait for this. */
@@ -1768,33 +1817,6 @@ fec_restart(struct net_device *dev, int duplex)
                 }
         }
 
-        /* Initialize the receive buffer descriptors. */
-        bdp = fep->rx_bd_base;
-        for (i = 0; i < RX_RING_SIZE; i++) {
-
-                /* Initialize the BD for every fragment in the page. */
-                bdp->cbd_sc = BD_ENET_RX_EMPTY;
-                bdp++;
-        }
-
-        /* Set the last buffer to wrap */
-        bdp--;
-        bdp->cbd_sc |= BD_SC_WRAP;
-
-        /* ...and the same for transmit */
-        bdp = fep->tx_bd_base;
-        for (i = 0; i < TX_RING_SIZE; i++) {
-
-                /* Initialize the BD for every fragment in the page. */
-                bdp->cbd_sc = 0;
-                bdp->cbd_bufaddr = 0;
-                bdp++;
-        }
-
-        /* Set the last buffer to wrap */
-        bdp--;
-        bdp->cbd_sc |= BD_SC_WRAP;
-
         /* Enable MII mode */
         if (duplex) {
                 /* MII enable / FD enable */