From: David S. Miller Date: Mon, 28 Sep 2020 21:54:13 +0000 (-0700) Subject: Merge branch '1GbE' of https://github.com/anguy11/next-queue X-Git-Tag: Ubuntu-5.13.0-19.19~4830^2~127 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=35d37709f1759c12ef70caae4fb0b110d5238036;p=mirror_ubuntu-jammy-kernel.git Merge branch '1GbE' of https://github.com/anguy11/next-queue Tony Nguyen says: ==================== 1GbE Intel Wired LAN Driver Updates 2020-09-28 This series contains updates to igb, igc, and e1000e drivers. Sven Auhagen adds XDP support for igb. Gal Hammer allows for 82576 to display part number string correctly for igb. Sasha adds device IDs for i221 and i226 parts. Exposes LPI counters and removes unused fields in structures for igc. He also adds Meteor Lake support for e1000e. For igc, Andre renames IGC_TSYNCTXCTL_VALID to IGC_TSYNCTXCTL_TXTT_0 to match the datasheet and adds a warning if it's not set when expected. Removes the PTP Tx timestamp check in igc_ptp_tx_work() as it's already checked in the watchdog_task. Cleans up some code by removing invalid error bits, renaming a bit to match datasheet naming, and removing a, now unneeded, macro. Vinicius makes changes for igc PTP: removes calling SYSTIMR to latch timer value, stores PTP time before a reset, and rejects schedules with times in the future. v2: Remove 'inline' from igb_xdp_tx_queue_mapping() and igb_rx_offset() for patch 1 ==================== Signed-off-by: David S. Miller --- 35d37709f1759c12ef70caae4fb0b110d5238036