Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 25 insertions, 24 deletions

diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index d500a5771dbc..5de0554fd7c6 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -518,6 +518,7 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
 #else
         int bar = 1;
 #endif
+        int phy, phy_idx = 0;
 
 
 /* when built into the kernel, we only print version if device is found */
@@ -549,6 +550,7 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
         for (i = 0; i < 3; i++)
                 ((u16 *)dev->dev_addr)[i] =
                         le16_to_cpu(eeprom_read(ioaddr, i + EEPROM_SA_OFFSET));
+        memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
         dev->base_addr = (unsigned long)ioaddr;
         dev->irq = irq;
@@ -605,33 +607,31 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
                         printk("%2.2x:", dev->dev_addr[i]);
         printk("%2.2x, IRQ %d.\n", dev->dev_addr[i], irq);
 
-        if (1) {
-                int phy, phy_idx = 0;
-                np->phys[0] = 1;                /* Default setting */
-                np->mii_preamble_required++;
-                for (phy = 1; phy < 32 && phy_idx < MII_CNT; phy++) {
-                        int mii_status = mdio_read(dev, phy, MII_BMSR);
-                        if (mii_status != 0xffff  &&  mii_status != 0x0000) {
-                                np->phys[phy_idx++] = phy;
-                                np->mii_if.advertising = mdio_read(dev, phy, MII_ADVERTISE);
-                                if ((mii_status & 0x0040) == 0)
-                                        np->mii_preamble_required++;
-                                printk(KERN_INFO "%s: MII PHY found at address %d, status "
-                                           "0x%4.4x advertising %4.4x.\n",
-                                           dev->name, phy, mii_status, np->mii_if.advertising);
-                        }
-                }
-                np->mii_preamble_required--;
-
-                if (phy_idx == 0) {
-                        printk(KERN_INFO "%s: No MII transceiver found, aborting.  ASIC status %x\n",
-                                   dev->name, ioread32(ioaddr + ASICCtrl));
-                        goto err_out_unregister;
+        np->phys[0] = 1;                /* Default setting */
+        np->mii_preamble_required++;
+        for (phy = 1; phy <= 32 && phy_idx < MII_CNT; phy++) {
+                int mii_status = mdio_read(dev, phy, MII_BMSR);
+                int phyx = phy & 0x1f;
+                if (mii_status != 0xffff  &&  mii_status != 0x0000) {
+                        np->phys[phy_idx++] = phyx;
+                        np->mii_if.advertising = mdio_read(dev, phyx, MII_ADVERTISE);
+                        if ((mii_status & 0x0040) == 0)
+                                np->mii_preamble_required++;
+                        printk(KERN_INFO "%s: MII PHY found at address %d, status "
+                                   "0x%4.4x advertising %4.4x.\n",
+                                   dev->name, phyx, mii_status, np->mii_if.advertising);
                 }
+        }
+        np->mii_preamble_required--;
 
-                np->mii_if.phy_id = np->phys[0];
+        if (phy_idx == 0) {
+                printk(KERN_INFO "%s: No MII transceiver found, aborting.  ASIC status %x\n",
+                           dev->name, ioread32(ioaddr + ASICCtrl));
+                goto err_out_unregister;
         }
 
+        np->mii_if.phy_id = np->phys[0];
+
         /* Parse override configuration */
         np->an_enable = 1;
         if (card_idx < MAX_UNITS) {
@@ -692,7 +692,7 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
         /* Reset the chip to erase previous misconfiguration. */
         if (netif_msg_hw(np))
                 printk("ASIC Control is %x.\n", ioread32(ioaddr + ASICCtrl));
-        iowrite16(0x007f, ioaddr + ASICCtrl + 2);
+        iowrite16(0x00ff, ioaddr + ASICCtrl + 2);
         if (netif_msg_hw(np))
                 printk("ASIC Control is now %x.\n", ioread32(ioaddr + ASICCtrl));
 
@@ -1619,6 +1619,7 @@ static struct ethtool_ops ethtool_ops = {
         .get_link = get_link,
         .get_msglevel = get_msglevel,
         .set_msglevel = set_msglevel,
+        .get_perm_addr = ethtool_op_get_perm_addr,
 };
 
 static int netdev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)