Remove nic_disable call from drivers. Call should be made at a higher level

diff --git a/src/drivers/net/davicom.c b/src/drivers/net/davicom.c
index 3a470c835e9f323def65bcd93bfd48d3ba8f171f..a859cd80104484d0a0c98847737d7672333517ab 100644 (file)
--- a/src/drivers/net/davicom.c
+++ b/src/drivers/net/davicom.c
@@ -617,7 +617,7 @@ static int davicom_poll(struct nic *nic, int retrieve)
 /* eth_disable - Disable the interface                               */
 /*********************************************************************/
 static void davicom_disable ( struct nic *nic, struct pci_device *pci __unused ) {
-  nic_disable ( nic );
+
   whereami("davicom_disable\n");
 
   davicom_reset(nic);

diff --git a/src/drivers/net/mtd80x.c b/src/drivers/net/mtd80x.c
index 925da9bf0bbce88e5d0d1595bcd527ebc5972fbd..c3696534b454c6886606396994cd8e8830c3ede9 100644 (file)
--- a/src/drivers/net/mtd80x.c
+++ b/src/drivers/net/mtd80x.c
@@ -636,12 +636,13 @@ static void mtd_transmit(
 DISABLE - Turn off ethernet interface
 ***************************************************************************/
 static void mtd_disable ( struct nic *nic, struct pci_device *pci __unused ) {
-    nic_disable ( nic );
-    /* put the card in its initial state */
+
     /* Disable Tx Rx*/
     outl( mtdx.crvalue & (~TxEnable) & (~RxEnable), mtdx.ioaddr + TCRRCR);
+
     /* Reset the chip to erase previous misconfiguration. */
     mtd_reset(nic);
+
     DBG(("DISABLE\n"));
 }
 

diff --git a/src/drivers/net/natsemi.c b/src/drivers/net/natsemi.c
index b40fb1315820bb9ea9b2211729379a602ea1d1ee..e80935bdf2325143c54aae1d608397b8c9ed6679 100644 (file)
--- a/src/drivers/net/natsemi.c
+++ b/src/drivers/net/natsemi.c
@@ -723,8 +723,7 @@ natsemi_poll(struct nic *nic, int retrieve)
 
 static void
 natsemi_disable ( struct nic *nic, struct pci_device *pci __unused ) {
-    nic_disable ( nic );
-    /* merge reset and disable */
+
     natsemi_init(nic);
 
     /* Disable interrupts using the mask. */

diff --git a/src/drivers/net/sis900.c b/src/drivers/net/sis900.c
index 8040ddd5d4b8ad4cf34b22281016de274c2c258b..804d5f99ca1fdd3f10cab5149831baeb2165cd99 100644 (file)
--- a/src/drivers/net/sis900.c
+++ b/src/drivers/net/sis900.c
@@ -1228,8 +1228,7 @@ sis900_poll(struct nic *nic, int retrieve)
 
 static void
 sis900_disable ( struct nic *nic, struct pci_device *pci __unused ) {
-    nic_disable ( nic );
-    /* merge reset and disable */
+
     sis900_init(nic);
 
     /* Disable interrupts by clearing the interrupt mask. */

diff --git a/src/drivers/net/smc9000.c b/src/drivers/net/smc9000.c
index 43f04f0614cefbc5aa7e5eec794ca3e04538be7d..9d3542cbc531f934eab910c746f9ff2f7d7ed2ad 100644 (file)
--- a/src/drivers/net/smc9000.c
+++ b/src/drivers/net/smc9000.c
@@ -792,7 +792,7 @@ static int smc9000_poll(struct nic *nic, int retrieve)
 }
 
 static void smc9000_disable ( struct nic *nic, struct isa_device *isa __unused ) {
-   nic_disable ( nic );
+
    smc_reset(nic->ioaddr);
 
    /* no more interrupts for me */

diff --git a/src/drivers/net/tulip.c b/src/drivers/net/tulip.c
index c81b68278119f2c0aebf385971d2bdb5a6b9627d..15067e901b97db8ff6512f0a4e89bb7cde234d32 100644 (file)
--- a/src/drivers/net/tulip.c
+++ b/src/drivers/net/tulip.c
@@ -1185,7 +1185,7 @@ static int tulip_poll(struct nic *nic, int retrieve)
 /* eth_disable - Disable the interface                               */
 /*********************************************************************/
 static void tulip_disable ( struct nic *nic, struct pci_device *pci __unused ) {
-nic_disable ( nic );
+
 #ifdef TULIP_DEBUG_WHERE
     whereami("tulip_disable\n");
 #endif

diff --git a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c
index b72c13bbc8b6663a3646832ea5b550e52af82cb5..26642237eaf884eb3fe3681bb98eb767ab31afea 100644 (file)
--- a/src/drivers/net/via-rhine.c
+++ b/src/drivers/net/via-rhine.c
@@ -1164,7 +1164,7 @@ rhine_probe1 (struct nic *nic, struct pci_device *pci, int ioaddr, int chip_id,
 
 static void 
 rhine_disable ( struct nic *nic, struct pci_device *pci __unused ) {
-    nic_disable ( nic );
+
     struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
     int ioaddr = tp->ioaddr;
 

diff --git a/src/drivers/net/w89c840.c b/src/drivers/net/w89c840.c
index 97d8d158772bbb86b0a13be57d23541c15331480..bff3792304cbc5c5ba1cd482419b183e50773729 100644 (file)
--- a/src/drivers/net/w89c840.c
+++ b/src/drivers/net/w89c840.c
@@ -576,7 +576,7 @@ static void w89c840_transmit(
 w89c840_disable - Turn off ethernet interface
 ***************************************************************************/
 static void w89c840_disable ( struct nic *nic, struct pci_device *pci __unused ) {
-    nic_disable ( nic );
+
     /* merge reset and disable */
     w89c840_reset(nic);