1. 01 Nov, 2018 4 commits
    • Jaime Caamaño Ruiz's avatar
      openvswitch: Fix push/pop ethernet validation · 46ebe283
      Jaime Caamaño Ruiz authored
      When there are both pop and push ethernet header actions among the
      actions to be applied to a packet, an unexpected EINVAL (Invalid
      argument) error is obtained. This is due to mac_proto not being reset
      correctly when those actions are validated.
      
      Reported-at:
      https://mail.openvswitch.org/pipermail/ovs-discuss/2018-October/047554.html
      Fixes: 91820da6 ("openvswitch: add Ethernet push and pop actions")
      Signed-off-by: default avatarJaime Caamaño Ruiz <jcaamano@suse.com>
      Tested-by: default avatarGreg Rose <gvrose8192@gmail.com>
      Reviewed-by: default avatarGreg Rose <gvrose8192@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      46ebe283
    • Niklas Cassel's avatar
      net: stmmac: Fix stmmac_mdio_reset() when building stmmac as modules · 30549aab
      Niklas Cassel authored
      When building stmmac, it is only possible to select CONFIG_DWMAC_GENERIC,
      or any of the glue drivers, when CONFIG_STMMAC_PLATFORM is set.
      The only exception is CONFIG_STMMAC_PCI.
      
      When calling of_mdiobus_register(), it will call our ->reset()
      callback, which is set to stmmac_mdio_reset().
      
      Most of the code in stmmac_mdio_reset() is protected by a
      "#if defined(CONFIG_STMMAC_PLATFORM)", which will evaluate
      to false when CONFIG_STMMAC_PLATFORM=m.
      
      Because of this, the phy reset gpio will only be pulled when
      stmmac is built as built-in, but not when built as modules.
      
      Fix this by using "#if IS_ENABLED()" instead of "#if defined()".
      Signed-off-by: default avatarNiklas Cassel <niklas.cassel@linaro.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      30549aab
    • David S. Miller's avatar
      Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue · 4d3163cf
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      Intel Wired LAN Driver Updates 2018-10-31
      
      This series contains a various collection of fixes.
      
      Miroslav Lichvar from Red Hat or should I say IBM now?  Updates the PHC
      timecounter interval for igb so that it gets updated at least once
      every 550 seconds.
      
      Ngai-Mint provides a fix for fm10k to prevent a soft lockup or system
      crash by adding a new condition to determine if the SM mailbox is in the
      correct state before proceeding.
      
      Jake provides several fm10k fixes, first one marks complier aborts as
      non-fatal since on some platforms trigger machine check errors when the
      compile aborts.  Added missing device ids to the in-kernel driver.  Due
      to the recent fixes, bumped the driver version.
      
      I (Jeff Kirsher) fixed a XFRM_ALGO dependency for both ixgbe and
      ixgbevf.  This fix was based on the original work from Arnd Bergmann,
      which only fixed ixgbe.
      
      Mitch provides a fix for i40e/avf to update the status codes, which
      resolves an issue between a mis-match between i40e and the iavf driver,
      which also supports the ice LAN driver.
      
      Radoslaw fixes the ixgbe where the driver is logging a message about
      spoofed packets detected when the VF is re-started with a different MAC
      address.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4d3163cf
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf · df975da4
      David S. Miller authored
      Daniel Borkmann says:
      
      ====================
      pull-request: bpf 2018-11-01
      
      The following pull-request contains BPF updates for your *net* tree.
      
      The main changes are:
      
      1) Fix tcp_bpf_recvmsg() to return -EAGAIN instead of 0 in non-blocking
         case when no data is available yet, from John.
      
      2) Fix a compilation error in libbpf_attach_type_by_name() when compiled
         with clang 3.8, from Andrey.
      
      3) Fix a partial copy of map pointer on scalar alu and remove id
         generation for RET_PTR_TO_MAP_VALUE return types, from Daniel.
      
      4) Add unlimited memlock limit for kernel selftest's flow_dissector_load
         program, from Yonghong.
      
      5) Fix ping for some BPF shell based kselftests where distro does not
         ship "ping -6" anymore, from Li.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      df975da4
  2. 31 Oct, 2018 36 commits