diff options
| author | Don Fry <pcnet32@verizon.net> | 2007-10-18 00:59:22 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-10-18 02:17:34 +0200 |
| commit | feff348fc0fe06870a8ec05e78af8ed5cc4c2bdf (patch) | |
| tree | 0d83851e81f8edeb70812a2ba3654f830b149dcf /drivers/net | |
| parent | fix EMAC driver for proper napi_synchronize API (diff) | |
| download | linux-feff348fc0fe06870a8ec05e78af8ed5cc4c2bdf.tar.xz linux-feff348fc0fe06870a8ec05e78af8ed5cc4c2bdf.zip | |
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 <pcnet32@verizon.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/pcnet32.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index 5f994b5beda1..159a64586d00 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 |