1. 09 11月, 2018 38 次提交
  2. 08 11月, 2018 2 次提交
    • D
      Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 5867b330
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2018-11-07
      
      This series contains updates to almost all of the Intel wired LAN
      drivers.
      
      Lance Roy replaces a spin lock with lockdep_assert_held() for igbvf
      driver in move toward trying to remove spin_is_locked().
      
      Colin Ian King fixes a potential null pointer dereference by adding a
      check in ixgbe.  Also fixed the igc driver by properly assigning the
      return error code of a function call, so that we can properly check it.
      
      Shannon Nelson updates the ixgbe driver to not block IPsec offload when
      in VEPA mode, in VEB mode, IPsec offload is still blocked because the
      device drops packets into a black hole.
      
      Jake adds support for software timestamping for packets sent over
      ixgbevf.  Also modifies i40e, iavf, igb, igc, and ixgbe to delay calling
      skb_tx_timestamp() to the latest point possible, which is just prior to
      notifying the hardware of the new Tx packet.
      
      Todd adds the new WoL filter flag so that we properly report that we do
      not support this new feature.
      
      YueHaibing from Huawei fixes the igc driver by cleaning up variables
      that are not "really" used.
      
      Dan Carpenter cleans up igc whitespace issues.
      
      Miroslav Lichvar fixes e1000e for potential underflow issue in the
      timecounter, so modify the driver to use timecounter_cyc2time() to allow
      non-monotonic SYSTIM readings.
      
      Sasha provides additional igc cleanups based on community feedback.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5867b330
    • D
      Merge branch 'nfp-add-and-use-tunnel-netdev-helpers' · be08989c
      David S. Miller 提交于
      John Hurley says:
      
      ====================
      nfp: add and use tunnel netdev helpers
      
      A recent patch introduced the function netif_is_vxlan() to verify the
      tunnel type of a given netdev as vxlan.
      
      Add a similar function to detect geneve netdevs and make use of this
      function in the NFP driver. Also make use of the vxlan helper where
      applicable.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      be08989c