patch-2.2.17 linux/drivers/net/mace.c

• Lines: 25
• Date: Mon Sep 4 18:39:19 2000
• Orig file: v2.2.16/drivers/net/mace.c
• Orig date: Mon Sep 4 18:37:25 2000

diff -u --recursive --new-file v2.2.16/drivers/net/mace.c linux/drivers/net/mace.c
@@ -266,7 +266,11 @@
     /* done changing address */
     out_8(&mb->iac, 0);
 
+#ifndef CONFIG_MACE_AAUI_PORT
     out_8(&mb->plscc, PORTSEL_GPSI + ENPLSIO);
+#else
+    out_8(&mb->plscc, PORTSEL_AUI + ENPLSIO);
+#endif /* CONFIG_MACE_AAUI_PORT */
 }
 
 static void __mace_set_address(struct device *dev, void *addr)
@@ -922,9 +926,9 @@
     struct mace_data *mp = (struct mace_data *) mace_devs->priv;
     unregister_netdev(mace_devs);
 
-    free_irq(mace_devs->irq, mace_interrupt);
-    free_irq(mp->tx_dma_intr, mace_txdma_intr);
-    free_irq(mp->rx_dma_intr, mace_rxdma_intr);
+    free_irq(mace_devs->irq, mace_devs);
+    free_irq(mp->tx_dma_intr, mace_devs);
+    free_irq(mp->rx_dma_intr, mace_devs);
 
     kfree(mace_devs);
     mace_devs = NULL;