Browse Source

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

tags/v0.9.3
Marty Connor 18 years ago
parent
commit
35f90278a8

+ 1
- 1
src/drivers/net/davicom.c View File

617
 /* eth_disable - Disable the interface                               */
617
 /* eth_disable - Disable the interface                               */
618
 /*********************************************************************/
618
 /*********************************************************************/
619
 static void davicom_disable ( struct nic *nic, struct pci_device *pci __unused ) {
619
 static void davicom_disable ( struct nic *nic, struct pci_device *pci __unused ) {
620
-  nic_disable ( nic );
620
+
621
   whereami("davicom_disable\n");
621
   whereami("davicom_disable\n");
622
 
622
 
623
   davicom_reset(nic);
623
   davicom_reset(nic);

+ 3
- 2
src/drivers/net/mtd80x.c View File

636
 DISABLE - Turn off ethernet interface
636
 DISABLE - Turn off ethernet interface
637
 ***************************************************************************/
637
 ***************************************************************************/
638
 static void mtd_disable ( struct nic *nic, struct pci_device *pci __unused ) {
638
 static void mtd_disable ( struct nic *nic, struct pci_device *pci __unused ) {
639
-    nic_disable ( nic );
640
-    /* put the card in its initial state */
639
+
641
     /* Disable Tx Rx*/
640
     /* Disable Tx Rx*/
642
     outl( mtdx.crvalue & (~TxEnable) & (~RxEnable), mtdx.ioaddr + TCRRCR);
641
     outl( mtdx.crvalue & (~TxEnable) & (~RxEnable), mtdx.ioaddr + TCRRCR);
642
+
643
     /* Reset the chip to erase previous misconfiguration. */
643
     /* Reset the chip to erase previous misconfiguration. */
644
     mtd_reset(nic);
644
     mtd_reset(nic);
645
+
645
     DBG(("DISABLE\n"));
646
     DBG(("DISABLE\n"));
646
 }
647
 }
647
 
648
 

+ 1
- 2
src/drivers/net/natsemi.c View File

723
 
723
 
724
 static void
724
 static void
725
 natsemi_disable ( struct nic *nic, struct pci_device *pci __unused ) {
725
 natsemi_disable ( struct nic *nic, struct pci_device *pci __unused ) {
726
-    nic_disable ( nic );
727
-    /* merge reset and disable */
726
+
728
     natsemi_init(nic);
727
     natsemi_init(nic);
729
 
728
 
730
     /* Disable interrupts using the mask. */
729
     /* Disable interrupts using the mask. */

+ 1
- 2
src/drivers/net/sis900.c View File

1228
 
1228
 
1229
 static void
1229
 static void
1230
 sis900_disable ( struct nic *nic, struct pci_device *pci __unused ) {
1230
 sis900_disable ( struct nic *nic, struct pci_device *pci __unused ) {
1231
-    nic_disable ( nic );
1232
-    /* merge reset and disable */
1231
+
1233
     sis900_init(nic);
1232
     sis900_init(nic);
1234
 
1233
 
1235
     /* Disable interrupts by clearing the interrupt mask. */
1234
     /* Disable interrupts by clearing the interrupt mask. */

+ 1
- 1
src/drivers/net/smc9000.c View File

792
 }
792
 }
793
 
793
 
794
 static void smc9000_disable ( struct nic *nic, struct isa_device *isa __unused ) {
794
 static void smc9000_disable ( struct nic *nic, struct isa_device *isa __unused ) {
795
-   nic_disable ( nic );
795
+
796
    smc_reset(nic->ioaddr);
796
    smc_reset(nic->ioaddr);
797
 
797
 
798
    /* no more interrupts for me */
798
    /* no more interrupts for me */

+ 1
- 1
src/drivers/net/tulip.c View File

1185
 /* eth_disable - Disable the interface                               */
1185
 /* eth_disable - Disable the interface                               */
1186
 /*********************************************************************/
1186
 /*********************************************************************/
1187
 static void tulip_disable ( struct nic *nic, struct pci_device *pci __unused ) {
1187
 static void tulip_disable ( struct nic *nic, struct pci_device *pci __unused ) {
1188
-nic_disable ( nic );
1188
+
1189
 #ifdef TULIP_DEBUG_WHERE
1189
 #ifdef TULIP_DEBUG_WHERE
1190
     whereami("tulip_disable\n");
1190
     whereami("tulip_disable\n");
1191
 #endif
1191
 #endif

+ 1
- 1
src/drivers/net/via-rhine.c View File

1164
 
1164
 
1165
 static void 
1165
 static void 
1166
 rhine_disable ( struct nic *nic, struct pci_device *pci __unused ) {
1166
 rhine_disable ( struct nic *nic, struct pci_device *pci __unused ) {
1167
-    nic_disable ( nic );
1167
+
1168
     struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
1168
     struct rhine_private *tp = (struct rhine_private *) nic->priv_data;
1169
     int ioaddr = tp->ioaddr;
1169
     int ioaddr = tp->ioaddr;
1170
 
1170
 

+ 1
- 1
src/drivers/net/w89c840.c View File

576
 w89c840_disable - Turn off ethernet interface
576
 w89c840_disable - Turn off ethernet interface
577
 ***************************************************************************/
577
 ***************************************************************************/
578
 static void w89c840_disable ( struct nic *nic, struct pci_device *pci __unused ) {
578
 static void w89c840_disable ( struct nic *nic, struct pci_device *pci __unused ) {
579
-    nic_disable ( nic );
579
+
580
     /* merge reset and disable */
580
     /* merge reset and disable */
581
     w89c840_reset(nic);
581
     w89c840_reset(nic);
582
 
582
 

Loading…
Cancel
Save