[bionic/linux-azure, cosmic/linux-azure][PATCH 0/2] netfilter: nf_conntrack: resolve clash for matching conntracks

[Marcelo Henrique Cerri]

BugLink: http://bugs.launchpad.net/bugs/1795493


Martynas Pumputis (2):
  UBUNTU: SAUCE: netfilter: nf_conntrack: resolve clash for matching
    conntracks
  UBUNTU: SOURCE: netfilter: nf_nat: return the same reply tuple for
    matching CTs

 include/net/netfilter/nf_conntrack.h     |  5 +--
 include/net/netfilter/nf_nat.h           |  3 +-
 net/ipv4/netfilter/nf_nat_proto_gre.c    |  2 +-
 net/ipv4/netfilter/nf_nat_proto_icmp.c   |  2 +-
 net/ipv6/netfilter/nf_nat_proto_icmpv6.c |  2 +-
 net/netfilter/nf_conntrack_core.c        | 42 +++++++++++++++++-------
 net/netfilter/nf_nat_core.c              | 34 +++++++++++++++----
 net/netfilter/nf_nat_proto_common.c      |  2 +-
 8 files changed, 68 insertions(+), 24 deletions(-)

-- 
2.17.1