From 5980bdb21ee1c39455ed319b8390800d9cd7de14 Mon Sep 17 00:00:00 2001 From: Zheng Da Date: Sat, 27 Feb 2010 15:43:29 +0100 Subject: Use pcnet32 driver in Linux 2.6.29. --- dde_pcnet32/pcnet32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dde_pcnet32/pcnet32.c b/dde_pcnet32/pcnet32.c index 27996de5..844e1e07 100644 --- a/dde_pcnet32/pcnet32.c +++ b/dde_pcnet32/pcnet32.c @@ -1399,7 +1399,7 @@ static int pcnet32_poll(struct napi_struct *napi, int budget) if (work_done < budget) { spin_lock_irqsave(&lp->lock, flags); - __napi_complete(napi); + __netif_rx_complete(napi); /* clear interrupt masks */ val = lp->a.read_csr(ioaddr, CSR3); @@ -2594,14 +2594,14 @@ pcnet32_interrupt(int irq, void *dev_id) dev->name, csr0); /* unlike for the lance, there is no restart needed */ } - if (napi_schedule_prep(&lp->napi)) { + if (netif_rx_schedule_prep(&lp->napi)) { u16 val; /* set interrupt masks */ val = lp->a.read_csr(ioaddr, CSR3); val |= 0x5f00; lp->a.write_csr(ioaddr, CSR3, val); mmiowb(); - __napi_schedule(&lp->napi); + __netif_rx_schedule(&lp->napi); break; } csr0 = lp->a.read_csr(ioaddr, CSR0); -- cgit v1.2.3