← Back to branch summary

~n-muench/ubuntu/quantal/open-vm-tools/open-vm-tools.may2.sid-sync

« back to all changes in this revision

Viewing changes to modules/linux/vmxnet3/vmxnet3.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2009-05-30 09:48:43 UTC
  • mfrom: (1.1.5 upstream) (2.4.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090530094843-gdpza57r5iqsf124
Tags: 2009.05.22-167859-1
Merging upstream version 2009.05.22-167859.

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/linux/vmxnet3/vmxnet3.c
385
385
   vmxnet3_do_poll(adapter, budget, &txd_done, &rxd_done);
386
386
 
387
387
   if (rxd_done < budget) {
388
 
      compat_netif_rx_complete(adapter->netdev, napi);
 
388
      compat_napi_complete(adapter->netdev, napi);
389
389
      vmxnet3_enable_intr(adapter, 0);
390
390
   }
391
391
   return rxd_done;
419
419
   poll_dev->quota -= rxd_done;
420
420
 
421
421
   if (rxd_done < quota) {
422
 
      netif_rx_complete(poll_dev);
 
422
      compat_napi_complete(poll_dev, unused);
423
423
      vmxnet3_enable_intr(adapter, 0);
424
424
      return 0;
425
425
   }
467
467
      vmxnet3_disable_intr(adapter, 0);
468
468
   }
469
469
 
470
 
   compat_netif_rx_schedule(dev, &adapter->napi);
 
470
   compat_napi_schedule(dev, &adapter->napi);
471
471
 
472
472
#else
473
473
   vmxnet3_tq_tx_complete(&adapter->tx_queue, adapter);
3749
3749
   }
3750
3750
 
3751
3751
   adapter->wol = wol->wolopts;
 
3752
 
 
3753
   compat_device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
 
3754
 
3752
3755
   return 0;
3753
3756
}
3754
3757