1. 26 Apr, 2018 3 commits
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · a9537c93
      David S. Miller authored
      Merging net into net-next to help the bpf folks avoid
      some really ugly merge conflicts.
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a9537c93
    • David S. Miller's avatar
      Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · e9350d44
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      1GbE Intel Wired LAN Driver Updates 2018-04-25
      
      This series enables some ethtool and tc-flower filters to be offloaded
      to igb-based network controllers. This is useful when the system
      configuration wants to steer kinds of traffic to a specific hardware
      queue for i210 devices only.
      
      The first two patch in the series are bug fixes.
      
      The basis of this series is to export the internal API used to
      configure address filters, so they can be used by ethtool, and
      extending the functionality so an source address can be handled.
      
      Then, we enable the tc-flower offloading implementation to re-use the
      same infrastructure as ethtool, and storing them in the per-adapter
      "nfc" (Network Filter Config?) list. But for consistency, for
      destructive access they are separated, i.e. an filter added by
      tc-flower can only be removed by tc-flower, but ethtool can read them
      all.
      
      Only support for VLAN Prio, Source and Destination MAC Address, and
      Ethertype is enabled for now.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      e9350d44
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf · 25eb0ea7
      David S. Miller authored
      Daniel Borkmann says:
      
      ====================
      pull-request: bpf 2018-04-25
      
      The following pull-request contains BPF updates for your *net* tree.
      
      The main changes are:
      
      1) Fix to clear the percpu metadata_dst that could otherwise carry
         stale ip_tunnel_info, from William.
      
      2) Fix that reduces the number of passes in x64 JIT with regards to
         dead code sanitation to avoid risk of prog rejection, from Gianluca.
      
      3) Several fixes of sockmap programs, besides others, fixing a double
         page_put() in error path, missing refcount hold for pinned sockmap,
         adding required -target bpf for clang in sample Makefile, from John.
      
      4) Fix to disable preemption in __BPF_PROG_RUN_ARRAY() paths, from Roman.
      
      5) Fix tools/bpf/ Makefile with regards to a lex/yacc build error
         seen on older gcc-5, from John.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      25eb0ea7
  2. 25 Apr, 2018 37 commits