diff options
| author | Michael Brown | 2006-03-16 20:04:19 +0100 |
|---|---|---|
| committer | Michael Brown | 2006-03-16 20:04:19 +0100 |
| commit | 0806436d999773a71950163bbd7a86d5226842b4 (patch) | |
| tree | b5f82a4d2f6c1cebf959677b31ecac553edbb5d4 /src/drivers/net | |
| parent | Build under gpxe (diff) | |
| download | ipxe-0806436d999773a71950163bbd7a86d5226842b4.tar.gz ipxe-0806436d999773a71950163bbd7a86d5226842b4.tar.xz ipxe-0806436d999773a71950163bbd7a86d5226842b4.zip | |
Remove accidental duplicate arising from merge
Diffstat (limited to 'src/drivers/net')
| -rw-r--r-- | src/drivers/net/r8169.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c index 26454307..af2ea06b 100644 --- a/src/drivers/net/r8169.c +++ b/src/drivers/net/r8169.c @@ -571,7 +571,7 @@ static int rtl8169_init_board(struct pci_device *pdev) /************************************************************************** IRQ - Wait for a frame ***************************************************************************/ -void r8169_irq(struct nic *nic __unused, irq_action_t action) +static void r8169_irq(struct nic *nic __unused, irq_action_t action) { int intr_status = 0; int interested = RxOverflow | RxFIFOOver | RxErr | RxOK; @@ -596,30 +596,6 @@ void r8169_irq(struct nic *nic __unused, irq_action_t action) } } -static void r8169_irq ( struct nic *nic __unused, irq_action_t action ) { - int intr_status = 0; - int interested = RxUnderrun | RxOverflow | RxFIFOOver | RxErr | RxOK; - - switch ( action ) { - case DISABLE: - case ENABLE: - intr_status = RTL_R16(IntrStatus); - /* h/w no longer present (hotplug?) or major error, - bail */ - if (intr_status == 0xFFFF) - break; - - intr_status = intr_status & ~interested; - if ( action == ENABLE ) - intr_status = intr_status | interested; - RTL_W16(IntrMask, intr_status); - break; - case FORCE : - RTL_W8(TxPoll, (RTL_R8(TxPoll) | 0x01)); - break; - } -} - /************************************************************************** POLL - Wait for a frame ***************************************************************************/ |