1. 01 7月, 2020 2 次提交
    • L
      hinic: remove unused but set variable · 9d9f95a9
      Luo bin 提交于
      remove unused but set variable to avoid auto build test WARNING
      Signed-off-by: NLuo bin <luobin9@huawei.com>
      Reported-by: Nkernel test robot <lkp@intel.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9d9f95a9
    • D
      Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · e25974ae
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      1GbE Intel Wired LAN Driver Updates 2020-06-29
      
      This series contains updates to only the igc driver.
      
      Sasha added Energy Efficient Ethernet (EEE) support and Latency Tolerance
      Reporting (LTR) support for the igc driver. Added Low Power Idle (LPI)
      counters and cleaned up unused TCP segmentation counters. Removed
      igc_power_down_link() and call igc_power_down_phy_copper_base()
      directly. Removed unneeded copper media check.
      
      Andre cleaned up timestamping by removing un-supported features and
      duplicate code for i225. Fixed the timestamp check on the proper flag
      instead of the skb for pending transmit timestamps. Refactored
      igc_ptp_set_timestamp_mode() to simply the flow.
      
      v2: Removed the log message in patch 1 as suggested by David Miller.
          Note: The locking issue Jakub Kicinski saw in patch 5, currently
          exists in the current net-next tree, so Andre will resolve the
          locking issue in a follow-on patch.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      e25974ae
  2. 30 6月, 2020 38 次提交