pastebin - collaborative debugging tool
rovema.kpaste.net RSS


igb_avb-diff for stock Debian 5.10.0-8-rt-amd64
Posted by Anonymous on Wed 12th Jan 2022 07:33
raw | new post
modification of post by Anonymous (view diff)

  1. # needs rebase
  2. diff -r -u igb_avb/kmod/igb_ethtool.c igb_avb/kmod/igb_ethtool.c
  3. --- igb_avb/kmod/igb_ethtool.c  2021-11-16 08:33:42.829986006 +0100
  4. +++ igb_avb/kmod/igb_ethtool.c  2021-12-21 10:21:39.807901702 +0100
  5. @@ -3144,6 +3144,7 @@
  6.  
  7.  #endif /* ETHTOOL_SCHANNELS */
  8.  static const struct ethtool_ops igb_ethtool_ops = {
  9. +       .supported_coalesce_params = ETHTOOL_COALESCE_USECS,
  10.         .get_drvinfo            = igb_get_drvinfo,
  11.         .get_regs_len           = igb_get_regs_len,
  12.         .get_regs               = igb_get_regs,
  13. diff -r -u igb_avb/kmod/igb_main.c igb_avb/kmod/igb_main.c
  14. --- igb_avb/kmod/igb_main.c     2021-11-17 09:30:40.616405653 +0100
  15. +++ igb_avb/kmod/igb_main.c     2021-12-21 10:21:39.811901636 +0100
  16. @@ -5566,7 +5566,7 @@
  17.         tx_desc->read.olinfo_status = cpu_to_le32(olinfo_status);
  18.  }
  19.  
  20. -static void igb_tx_map(struct igb_ring *tx_ring,
  21. +static int igb_tx_map(struct igb_ring *tx_ring,
  22.                        struct igb_tx_buffer *first,
  23.                        const u8 hdr_len)
  24.  {
  25. @@ -5679,7 +5679,7 @@
  26.          */
  27.         mmiowb();
  28.  
  29. -       return;
  30. +       return 0;
  31.  
  32.  dma_error:
  33.         dev_err(tx_ring->dev, "TX DMA map failed\n");
  34. @@ -5696,6 +5696,7 @@
  35.         }
  36.  
  37.         tx_ring->next_to_use = i;
  38. +       return -1;
  39.  }
  40.  
  41.  static int __igb_maybe_stop_tx(struct igb_ring *tx_ring, const u16 size)
  42. @@ -7411,12 +7412,11 @@
  43.                         break;
  44.  
  45.                 /* prevent any other reads prior to eop_desc */
  46. -#if 0
  47. -               read_barrier_depends();
  48. -#else
  49. +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)
  50.                 smp_rmb();
  51. +#else         
  52. +               read_barrier_depends();
  53.  #endif
  54. -
  55.                 /* if DD is not set pending work has not been completed */
  56.                 if (!(eop_desc->wb.status & cpu_to_le32(E1000_TXD_STAT_DD)))
  57.                         break;
  58.  
  59.                 if (!(eop_desc->wb.status & cpu_to_le32(E1000_TXD_STAT_DD)))

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting:

To highlight particular lines, prefix each line with {%HIGHLIGHT}




All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at