[PATCH nf-next 0/5] netfilter: conntrack: remove some code

[Florian Westphal <fw@strlen.de>]

1) Remove the full tuple from the nf_conntrack_helper hash. Switch to hashing
   based on the helper name and L4 protocol.

2) Remove tuple from netfilter conntrack helper definitions. Eliminate
   redundant IPv4 and IPv6 registration requests.

3) Switch nf_conntrack to static registration. Remove helper autoassign
   port module params.

4) Remove the obsolete nf_ct_helper_init API from netfilter.

5) Add deprecation warnings for IRC and PPTP conntrack trackers. Update IRC
   helper help text to clarify its use for DCC extension.

Florian Westphal (5):
  netfilter: nf_conntrack_helper: do not hash by tuple
  netfilter: conntrack: get rid of tuple in helper definitions
  netfilter: nf_conntrack: switch to static registration
  netfilter: remove obsolete nf_ct_helper_init api
  netfilter: conntrack: add deprecation warnings for irc and pptp trackers

 include/net/netfilter/nf_conntrack_helper.h | 20 ++---
 net/ipv4/netfilter/nf_nat_snmp_basic_main.c |  5 +-
 net/netfilter/Kconfig                       | 11 +--
 net/netfilter/nf_conntrack_amanda.c         | 35 +++-----
 net/netfilter/nf_conntrack_broadcast.c      |  2 -
 net/netfilter/nf_conntrack_ftp.c            | 51 +++--------
 net/netfilter/nf_conntrack_h323_main.c      | 85 ++++++------------
 net/netfilter/nf_conntrack_helper.c         | 96 ++++++---------------
 net/netfilter/nf_conntrack_irc.c            | 40 ++++-----
 net/netfilter/nf_conntrack_netbios_ns.c     |  7 +-
 net/netfilter/nf_conntrack_pptp.c           |  7 +-
 net/netfilter/nf_conntrack_sane.c           | 50 +++--------
 net/netfilter/nf_conntrack_sip.c            | 61 +++++--------
 net/netfilter/nf_conntrack_snmp.c           |  7 +-
 net/netfilter/nf_conntrack_tftp.c           | 47 +++-------
 net/netfilter/nfnetlink_cthelper.c          | 20 ++---
 16 files changed, 177 insertions(+), 367 deletions(-)

-- 
2.53.0