diff options
| author |   Daniel Hellstrom <daniel@gaisler.com> | 2011-01-14 03:02:42 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-01-14 12:45:54 -0800 |
| commit | 1ca23434dd0001bd2bfff31b8251436b34aa9066 (patch) | |
| tree | aa6696927db181540cfd9ec551e54d18dfc60e4a /drivers/net/greth.c | |
| parent | GRETH: avoid writing bad speed/duplex when setting transfer mode (diff) | |
| download | linux-dev-1ca23434dd0001bd2bfff31b8251436b34aa9066.tar.xz linux-dev-1ca23434dd0001bd2bfff31b8251436b34aa9066.zip | |
GRETH: handle frame error interrupts
Frame error interrupts must also be handled since the RX flag only indicates
successful reception, it is unlikely but the old code may lead to dead lock
if 128 error frames are recieved in a row.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/greth.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/greth.c b/drivers/net/greth.c index e48d18216cbe..b888abe6cd21 100644 --- a/drivers/net/greth.c +++ b/drivers/net/greth.c @@ -586,12 +586,13 @@ static irqreturn_t greth_interrupt(int irq, void *dev_id) status = GRETH_REGLOAD(greth->regs->status); /* Handle rx and tx interrupts through poll */ - if (status & (GRETH_INT_RX | GRETH_INT_TX)) { + if (status & (GRETH_INT_RE | GRETH_INT_RX | + GRETH_INT_TE | GRETH_INT_TX)) { /* Clear interrupt status */ - GRETH_REGORIN(greth->regs->status, - status & (GRETH_INT_RX | GRETH_INT_TX)); - + GRETH_REGSAVE(greth->regs->status, + status & (GRETH_INT_RE | GRETH_INT_RX | + GRETH_INT_TE | GRETH_INT_TX)); retval = IRQ_HANDLED; /* Disable interrupts and schedule poll() */ |