forked from luck/tmp_suning_uos_patched
forcedeth: fixed missing call in napi poll
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>
This commit is contained in:
parent
420e85241e
commit
e0379a14fc
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user