david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

Remove accidental duplicate arising from merge

This commit is contained in:
Michael Brown 2006-03-16 19:04:19 +00:00
parent 239579efcf
commit 0806436d99
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/drivers/net/r8169.c
View File

@ -571,7 +571,7 @@ static int rtl8169_init_board(struct pci_device *pdev)
/************************************************************************** /**************************************************************************
IRQ - Wait for a frame 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 intr_status = 0;
int interested = RxOverflow | RxFIFOOver | RxErr | RxOK; 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 POLL - Wait for a frame
***************************************************************************/ ***************************************************************************/