Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  MAINTAINERS: update DMFE and wireless drivers mailing list
  ucc_geth: Add support to local-mac-address property
  ucc_geth: Remove obsolete workaround of link speed change
  cxgb3: sysfs attributes in -mm tree
  Add Attansic L1 ethernet driver.

1 files changed, 12 insertions, 67 deletions

diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index abb8611c5a91..31c97a6591a4 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -1709,75 +1709,13 @@ static void adjust_link(struct net_device *dev)
                 if (mii_info->speed != ugeth->oldspeed) {
                         switch (mii_info->speed) {
                         case 1000:
-#ifdef CONFIG_PPC_MPC836x
-/* FIXME: This code is for 100Mbs BUG fixing,
-remove this when it is fixed!!! */
-                                if (ugeth->ug_info->enet_interface ==
-                                    ENET_1000_GMII)
-                                /* Run the commands which initialize the PHY */
-                                {
-                                        tempval =
-                                            (u32) mii_info->mdio_read(ugeth->
-                                                dev, mii_info->mii_id, 0x1b);
-                                        tempval |= 0x000f;
-                                        mii_info->mdio_write(ugeth->dev,
-                                                mii_info->mii_id, 0x1b,
-                                                (u16) tempval);
-                                        tempval =
-                                            (u32) mii_info->mdio_read(ugeth->
-                                                dev, mii_info->mii_id,
-                                                MII_BMCR);
-                                        mii_info->mdio_write(ugeth->dev,
-                                                mii_info->mii_id, MII_BMCR,
-                                                (u16) (tempval | BMCR_RESET));
-                                } else if (ugeth->ug_info->enet_interface ==
-                                           ENET_1000_RGMII)
-                                /* Run the commands which initialize the PHY */
-                                {
-                                        tempval =
-                                            (u32) mii_info->mdio_read(ugeth->
-                                                dev, mii_info->mii_id, 0x1b);
-                                        tempval = (tempval & ~0x000f) | 0x000b;
-                                        mii_info->mdio_write(ugeth->dev,
-                                                mii_info->mii_id, 0x1b,
-                                                (u16) tempval);
-                                        tempval =
-                                            (u32) mii_info->mdio_read(ugeth->
-                                                dev, mii_info->mii_id,
-                                                MII_BMCR);
-                                        mii_info->mdio_write(ugeth->dev,
-                                                mii_info->mii_id, MII_BMCR,
-                                                (u16) (tempval | BMCR_RESET));
-                                }
-                                msleep(4000);
-#endif                          /* CONFIG_MPC8360 */
-                                adjust_enet_interface(ugeth);
+                                ugeth->ug_info->enet_interface = ENET_1000_RGMII;
                                 break;
                         case 100:
-                        case 10:
-#ifdef CONFIG_PPC_MPC836x
-/* FIXME: This code is for 100Mbs BUG fixing,
-remove this lines when it will be fixed!!! */
                                 ugeth->ug_info->enet_interface = ENET_100_RGMII;
-                                tempval =
-                                    (u32) mii_info->mdio_read(ugeth->dev,
-                                                              mii_info->mii_id,
-                                                              0x1b);
-                                tempval = (tempval & ~0x000f) | 0x000b;
-                                mii_info->mdio_write(ugeth->dev,
-                                                     mii_info->mii_id, 0x1b,
-                                                     (u16) tempval);
-                                tempval =
-                                    (u32) mii_info->mdio_read(ugeth->dev,
-                                                              mii_info->mii_id,
-                                                              MII_BMCR);
-                                mii_info->mdio_write(ugeth->dev,
-                                                     mii_info->mii_id, MII_BMCR,
-                                                     (u16) (tempval |
-                                                            BMCR_RESET));
-                                msleep(4000);
-#endif                          /* CONFIG_MPC8360 */
-                                adjust_enet_interface(ugeth);
+                                break;
+                        case 10:
+                                ugeth->ug_info->enet_interface = ENET_10_RGMII;
                                 break;
                         default:
                                 ugeth_warn
@@ -1785,6 +1723,7 @@ remove this lines when it will be fixed!!! */
                                      dev->name, mii_info->speed);
                                 break;
                         }
+                        adjust_enet_interface(ugeth);
 
                         ugeth_info("%s: Speed %dBT", dev->name,
                                    mii_info->speed);
@@ -4133,6 +4072,7 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
         static int mii_mng_configured = 0;
         const phandle *ph;
         const unsigned int *prop;
+        const void *mac_addr;
 
         ugeth_vdbg("%s: IN", __FUNCTION__);
 
@@ -4258,7 +4198,12 @@ static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *ma
 
         ugeth->ug_info = ug_info;
         ugeth->dev = dev;
-        memcpy(dev->dev_addr, get_property(np, "mac-address", NULL), 6);
+
+        mac_addr = get_property(np, "mac-address", NULL);
+        if (mac_addr == NULL)
+                mac_addr = get_property(np, "local-mac-address", NULL);
+        if (mac_addr)
+                memcpy(dev->dev_addr, mac_addr, 6);
 
         return 0;
 }