101-iegbe_fix_napi_interface.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. --- a/Embedded/src/GbE/iegbe_main.c
  2. +++ b/Embedded/src/GbE/iegbe_main.c
  3. @@ -3465,12 +3465,12 @@ static irqreturn_t iegbe_intr_msi(int ir
  4. printk("Critical error! ICR = 0x%x\n", icr);
  5. return IRQ_HANDLED;
  6. }
  7. - if (likely(netif_rx_schedule_prep(netdev, &adapter->napi))) {
  8. + if (likely(napi_schedule_prep(&adapter->napi))) {
  9. adapter->total_tx_bytes = 0;
  10. adapter->total_tx_packets = 0;
  11. adapter->total_rx_bytes = 0;
  12. adapter->total_rx_packets = 0;
  13. - __netif_rx_schedule(netdev, &adapter->napi);
  14. + __napi_schedule(&adapter->napi);
  15. } else
  16. iegbe_irq_enable(adapter);
  17. @@ -3527,12 +3527,12 @@ iegbe_intr(int irq, void *data)
  18. E1000_WRITE_REG(&adapter->hw, IMC, ~0);
  19. E1000_WRITE_FLUSH(&adapter->hw);
  20. }
  21. - if (likely(netif_rx_schedule_prep(netdev, &adapter->napi))) {
  22. + if (likely(napi_schedule_prep(&adapter->napi))) {
  23. adapter->total_tx_bytes = 0;
  24. adapter->total_tx_packets = 0;
  25. adapter->total_rx_bytes = 0;
  26. adapter->total_rx_packets = 0;
  27. - __netif_rx_schedule(netdev, &adapter->napi);
  28. + __napi_schedule(&adapter->napi);
  29. } else
  30. /* this really should not happen! if it does it is basically a
  31. * bug, but not a hard error, so enable ints and continue */
  32. @@ -3574,7 +3574,7 @@ static int iegbe_clean(struct napi_struc
  33. if (work_done < budget) {
  34. if (likely(adapter->itr_setting & 3))
  35. iegbe_set_itr(adapter);
  36. - netif_rx_complete(poll_dev, napi);
  37. + napi_complete(napi);
  38. iegbe_irq_enable(adapter);
  39. }