1 files changed, 8 insertions, 13 deletions

diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index 698568e751da..a3a7a3506bd2 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -17,12 +17,14 @@
         Support and updates available at
         http://www.scyld.com/network/sundance.html
         [link no longer provides useful info -jgarzik]
+        Archives of the mailing list are still available at
+        http://www.beowulf.org/pipermail/netdrivers/
 
 */
 
 #define DRV_NAME        "sundance"
-#define DRV_VERSION     "1.1"
-#define DRV_RELDATE     "27-Jun-2006"
+#define DRV_VERSION     "1.2"
+#define DRV_RELDATE     "11-Sep-2006"
 
 
 /* The user-configurable values.
@@ -646,7 +648,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(0x00ff, ioaddr + ASICCtrl + 2);
+        sundance_reset(dev, 0x00ff << 16);
         if (netif_msg_hw(np))
                 printk("ASIC Control is now %x.\n", ioread32(ioaddr + ASICCtrl));
 
@@ -1075,13 +1077,8 @@ reset_tx (struct net_device *dev)
         
         /* Reset tx logic, TxListPtr will be cleaned */
         iowrite16 (TxDisable, ioaddr + MACCtrl1);
-        iowrite16 (TxReset | DMAReset | FIFOReset | NetworkReset,
-                        ioaddr + ASICCtrl + 2);
-        for (i=50; i > 0; i--) {
-                if ((ioread16(ioaddr + ASICCtrl + 2) & ResetBusy) == 0)
-                        break;
-                mdelay(1);
-        }
+        sundance_reset(dev, (NetworkReset|FIFOReset|DMAReset|TxReset) << 16);
+
         /* free all tx skbuff */
         for (i = 0; i < TX_RING_SIZE; i++) {
                 skb = np->tx_skbuff[i];
@@ -1467,8 +1464,6 @@ static void set_rx_mode(struct net_device *dev)
         int i;
 
         if (dev->flags & IFF_PROMISC) {                 /* Set promiscuous. */
-                /* Unconditionally log net taps. */
-                printk(KERN_NOTICE "%s: Promiscuous mode enabled.\n", dev->name);
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptAll | AcceptMyPhys;
         } else if ((dev->mc_count > multicast_filter_limit)
@@ -1736,7 +1731,7 @@ static int __init sundance_init(void)
 #ifdef MODULE
         printk(version);
 #endif
-        return pci_module_init(&sundance_driver);
+        return pci_register_driver(&sundance_driver);
 }
 
 static void __exit sundance_exit(void)