• David S. Miller's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf · ccaba062
    David S. Miller authored
    Pablo Neira Ayuso says:
    
    ====================
    Netfilter fixes for net
    
    The following patchset contains Netfilter fixes for your net tree,
    they are:
    
    1) Revisit warning logic when not applying default helper assignment.
       Jiri Kosina considers we are breaking existing setups and not warning
       our users accordinly now that automatic helper assignment has been
       turned off by default. So let's make him happy by spotting the warning
       by when we find a helper but we cannot attach, instead of warning on the
       former deprecated behaviour. Patch from Jiri Kosina.
    
    2) Two patches to fix regression in ctnetlink interfaces with
       nfnetlink_queue. Specifically, perform more relaxed in CTA_STATUS
       and do not bail out if CTA_HELP indicates the same helper that we
       already have. Patches from Kevin Cernekee.
    
    3) A couple of bugfixes for ipset via Jozsef Kadlecsik. Due to wrong
       index logic in hash set types and null pointer exception in the
       list:set type.
    
    4) hashlimit bails out with correct userspace parameters due to wrong
       arithmetics in the code that avoids "divide by zero" when
       transforming the userspace timing in milliseconds to token credits.
       Patch from Alban Browaeys.
    
    5) Fix incorrect NFQA_VLAN_MAX definition, patch from
       Ken-ichirou MATSUZAWA.
    
    6) Don't not declare nfnetlink batch error list as static, since this
       may be used by several subsystems at the same time. Patch from
       Liping Zhang.
    ====================
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    ccaba062
xt_hashlimit.c 29.4 KB