Skip to content

Commit

Permalink
forcedeth: fixed missing call in napi poll
Browse files Browse the repository at this point in the history
The napi poll routine was missing the call to the optimized rx process
routine. This patch adds the missing call for the optimized path.

Signed-Off-By: Ayaz Abdulla <aabdulla@nvidia.com>

Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Ayaz Abdulla authored and Jeff Garzik committed Feb 27, 2007
1 parent 420e852 commit e0379a1
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions drivers/net/forcedeth.c
Original file line number Diff line number Diff line change
Expand Up @@ -3104,13 +3104,17 @@ static int nv_napi_poll(struct net_device *dev, int *budget)
struct fe_priv *np = netdev_priv(dev);
u8 __iomem *base = get_hwbase(dev);
unsigned long flags;
int retcode;

if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2)
if (np->desc_ver == DESC_VER_1 || np->desc_ver == DESC_VER_2) {
pkts = nv_rx_process(dev, limit);
else
retcode = nv_alloc_rx(dev);
} else {
pkts = nv_rx_process_optimized(dev, limit);
retcode = nv_alloc_rx_optimized(dev);
}

if (nv_alloc_rx(dev)) {
if (retcode) {
spin_lock_irqsave(&np->lock, flags);
if (!np->in_shutdown)
mod_timer(&np->oom_kick, jiffies + OOM_REFILL);
Expand Down

0 comments on commit e0379a1

Please sign in to comment.