From: Don Fry Date: Wed, 17 Oct 2007 22:59:22 +0000 (-0700) Subject: pcnet32: fix non-napi packet reception X-Git-Tag: v2.6.24-rc1~286^2~3 X-Git-Url: http://pilppa.org/gitweb/?a=commitdiff_plain;h=feff348fc0fe06870a8ec05e78af8ed5cc4c2bdf;p=linux-2.6-omap-h63xx.git pcnet32: fix non-napi packet reception Recent changes to the driver for the new napi API broke the reception of packets when in non-napi mode. The initialization of napi.weight was removed for the non-napi case leaving the value zero. Tested NAPI and non-NAPI on x86_64. Signed-off-by: Don Fry Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index 5f994b5beda..159a64586d0 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c @@ -1849,6 +1849,9 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) lp->mii_if.mdio_read = mdio_read; lp->mii_if.mdio_write = mdio_write; + /* napi.weight is used in both the napi and non-napi cases */ + lp->napi.weight = lp->rx_ring_size / 2; + #ifdef CONFIG_PCNET32_NAPI netif_napi_add(dev, &lp->napi, pcnet32_poll, lp->rx_ring_size / 2); #endif