1. 21 Mar, 2017 2 commits
    • David S. Miller's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 41e95736
      David S. Miller authored
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter/IPVS updates for net-next
      
      The following patchset contains Netfilter/IPVS updates for your
      net-next tree. A couple of new features for nf_tables, and unsorted
      cleanups and incremental updates for the Netfilter tree. More
      specifically, they are:
      
      1) Allow to check for TCP option presence via nft_exthdr, patch
         from Phil Sutter.
      
      2) Add symmetric hash support to nft_hash, from Laura Garcia Liebana.
      
      3) Use pr_cont() in ebt_log, from Joe Perches.
      
      4) Remove some dead code in arp_tables reported via static analysis
         tool, from Colin Ian King.
      
      5) Consolidate nf_tables expression validation, from Liping Zhang.
      
      6) Consolidate set lookup via nft_set_lookup().
      
      7) Remove unnecessary rcu read lock side in bridge netfilter, from
         Florian Westphal.
      
      8) Remove unused variable in nf_reject_ipv4, from Tahee Yoo.
      
      9) Pass nft_ctx struct to object initialization indirections, from
         Florian Westphal.
      
      10) Add code to integrate conntrack helper into nf_tables, also from
          Florian.
      
      11) Allow to check if interface index or name exists via
          NFTA_FIB_F_PRESENT, from Phil Sutter.
      
      12) Simplify resolve_normal_ct(), from Florian.
      
      13) Use per-limit spinlock in nft_limit and xt_limit, from Liping Zhang.
      
      14) Use rwlock in nft_set_rbtree set, also from Liping Zhang.
      
      15) One patch to remove a useless printk at netns init path in ipvs,
          and several patches to document IPVS knobs.
      
      16) Use refcount_t for reference counter in the Netfilter/IPVS code,
          from Elena Reshetova.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      41e95736
    • David S. Miller's avatar
      Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · b9974d76
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      1GbE Intel Wired LAN Driver Updates 2017-03-17
      
      This series contains updates to mainly igb, with one fix for ixgbe.
      
      Alex does all the changes in the series, starting with adding support
      for DMA_ATTR_WEAK_ORDERING to improve performance on some platforms.
      Modified igb to use the length of the packet instead of the DD status
      bit to determine if a new descriptor is ready to be processed.  Modified
      the driver to only go through the region in the receive ring that was
      designated to be cleaned up, instead of going through the entire ring
      on cleanup.  Cleaned up the transmit side, by clearing the transmit
      buffer_info only when resetting the rings.  Added a new upper limit for
      receive, which is based on the size of a 2K buffer minus padding, which
      will allow us to support build_skb going forward.  Fixed ethtool testing
      to only sync on the size of the frame that is being tested, instead of
      the entire receive buffer.  Updated the handling of page addresses to
      always use a void pointer with the consistent name of "va" to indicate
      that we are working with a virtual address.  Added a "chicken bit" so
      that we can turn off the new receive allocation feature, in the case
      where we need to fallback to the legacy receive path.  Added support for
      using 3K buffers in order 1 pages the same way we were using 2K buffers
      in 4K pages.  Added support for padding packet, since we limit the size
      of the frame, we are able to write to an offset within the buffer instead
      of having to write at the very start of the buffer.  This allows us to
      leaving padding room for things like supporting XDP in the future.
      Refactored the receive buffer page management, since there are 2-3 paths
      that can be taken depending on what receive modes are enabled, so to
      improve maintainability, break out the common bits into their own
      functions.  Add support for build_skb, again.  Lastly, fixed a typo in
      igb and ixgbe code comments.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b9974d76
  2. 20 Mar, 2017 1 commit
  3. 17 Mar, 2017 37 commits