1. 19 Oct, 2017 2 commits
    • Alexander Duyck's avatar
      macvlan/macvtap: Add support for L2 forwarding offloads with macvtap · 56fd2b2c
      Alexander Duyck authored
      This patch reverts earlier commit b13ba1b8 ("macvlan: forbid L2
      fowarding offload for macvtap"). The reason for reverting this is because
      the original patch no longer fixes what it previously did as the
      underlying structure has changed for macvtap. Specifically macvtap
      originally pulled packets directly off of the lowerdev. However in commit
      6acf54f1 ("macvtap: Add support of packet capture on macvtap device.")
      that code was changed and instead macvtap would listen directly on the
      macvtap device itself instead of the lower device. As such, the L2
      forwarding offload should now be able to provide a performance advantage of
      skipping the checks on the lower dev while not introducing any sort of
      regression.
      Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      56fd2b2c
    • David S. Miller's avatar
      Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · 8f2e9ca8
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      40GbE Intel Wired LAN Driver Updates 2017-10-17
      
      This series contains updates to i40e and ethtool.
      
      Alan provides most of the changes in this series which are mainly fixes
      and cleanups.  Renamed the ethtool "cmd" variable to "ks", since the new
      ethtool API passes us ksettings structs instead of command structs.
      Cleaned up an ifdef that was not accomplishing anything.  Added function
      header comments to provide better documentation.  Fixed two issues in
      i40e_get_link_ksettings(), by calling
      ethtool_link_ksettings_zero_link_mode() to ensure the advertising and
      link masks are cleared before we start setting bits.  Cleaned up and fixed
      code comments which were incorrect.  Separated the setting of autoneg in
      i40e_phy_types_to_ethtool() into its own conditional to clarify what PHYs
      support and advertise autoneg, and makes it easier to add new PHY types in
      the future.  Added ethtool functionality to intersect two link masks
      together to find the common ground between them.  Overhauled i40e to
      ensure that the new ethtool API macros are being used, instead of the
      old ones.  Fixed the usage of unsigned 64-bit division which is not
      supported on all architectures.
      
      Sudheer adds support for 25G Active Optical Cables (AOC) and Active Copper
      Cables (ACC) PHY types.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      8f2e9ca8
  2. 18 Oct, 2017 38 commits