Browse Source

Remove accidental duplicate arising from merge

tags/v0.9.3
Michael Brown 19 years ago
parent
commit
0806436d99
1 changed files with 1 additions and 25 deletions
  1. 1
    25
      src/drivers/net/r8169.c

+ 1
- 25
src/drivers/net/r8169.c View File

@@ -571,7 +571,7 @@ static int rtl8169_init_board(struct pci_device *pdev)
571 571
 /**************************************************************************
572 572
 IRQ - Wait for a frame
573 573
 ***************************************************************************/
574
-void r8169_irq(struct nic *nic __unused, irq_action_t action)
574
+static void r8169_irq(struct nic *nic __unused, irq_action_t action)
575 575
 {
576 576
 	int intr_status = 0;
577 577
 	int interested = RxOverflow | RxFIFOOver | RxErr | RxOK;
@@ -596,30 +596,6 @@ void r8169_irq(struct nic *nic __unused, irq_action_t action)
596 596
 	}
597 597
 }
598 598
 
599
-static void r8169_irq ( struct nic *nic __unused, irq_action_t action ) {
600
-	int intr_status = 0;
601
-	int interested = RxUnderrun | RxOverflow | RxFIFOOver | RxErr | RxOK;
602
- 
603
-	switch ( action ) {
604
-		case DISABLE:
605
-		case ENABLE:
606
-			intr_status = RTL_R16(IntrStatus);
607
-			/* h/w no longer present (hotplug?) or major error, 
608
-				bail */
609
-			if (intr_status == 0xFFFF)
610
-				break;
611
-
612
-			intr_status = intr_status & ~interested;
613
-			if ( action == ENABLE )
614
-				intr_status = intr_status | interested;
615
-			RTL_W16(IntrMask, intr_status);
616
-			break;
617
-		case FORCE :
618
-			RTL_W8(TxPoll, (RTL_R8(TxPoll) | 0x01));
619
-			break;
620
-	}
621
-}
622
-
623 599
 /**************************************************************************
624 600
 POLL - Wait for a frame
625 601
 ***************************************************************************/

Loading…
Cancel
Save