1. 11 5月, 2018 1 次提交
  2. 10 5月, 2018 1 次提交
  3. 09 5月, 2018 9 次提交
  4. 08 5月, 2018 27 次提交
  5. 07 5月, 2018 2 次提交
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next · 90278871
      David S. Miller 提交于
      Pablo Neira Ayuso says:
      
      ====================
      Netfilter/IPVS updates for net-next
      
      The following patchset contains Netfilter/IPVS updates for your net-next
      tree, more relevant updates in this batch are:
      
      1) Add Maglev support to IPVS. Moreover, store lastest server weight in
         IPVS since this is needed by maglev, patches from from Inju Song.
      
      2) Preparation works to add iptables flowtable support, patches
         from Felix Fietkau.
      
      3) Hand over flows back to conntrack slow path in case of TCP RST/FIN
         packet is seen via new teardown state, also from Felix.
      
      4) Add support for extended netlink error reporting for nf_tables.
      
      5) Support for larger timeouts that 23 days in nf_tables, patch from
         Florian Westphal.
      
      6) Always set an upper limit to dynamic sets, also from Florian.
      
      7) Allow number generator to make map lookups, from Laura Garcia.
      
      8) Use hash_32() instead of opencode hashing in IPVS, from Vicent Bernat.
      
      9) Extend ip6tables SRH match to support previous, next and last SID,
         from Ahmed Abdelsalam.
      
      10) Move Passive OS fingerprint nf_osf.c, from Fernando Fernandez.
      
      11) Expose nf_conntrack_max through ctnetlink, from Florent Fourcot.
      
      12) Several housekeeping patches for xt_NFLOG, x_tables and ebtables,
         from Taehee Yoo.
      
      13) Unify meta bridge with core nft_meta, then make nft_meta built-in.
         Make rt and exthdr built-in too, again from Florian.
      
      14) Missing initialization of tbl->entries in IPVS, from Cong Wang.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      90278871
    • F
      netfilter: nft_dynset: fix timeout updates on 32bit · b13468dc
      Florian Westphal 提交于
      This must now use a 64bit jiffies value, else we set
      a bogus timeout on 32bit.
      
      Fixes: 8e1102d5 ("netfilter: nf_tables: support timeouts larger than 23 days")
      Signed-off-by: NFlorian Westphal <fw@strlen.de>
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      b13468dc