[PATCH] netfilter: conntrack: fix clash resolution in nat

quot;netfilter: conntrack: skip clash resolution if 25 nat is in place") Signed-off-by: Haishuang Yan <yanhaishu...@cmss.chinamobile.com> --- net/netfilter/nf_conntrack_core.c | 1 - net/netfilter/nf_nat_core.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git

[PATCH] netfilter: ctnetlink: move CTA_TIMEOUT case to outside

When cda[CTA_TIMEOUT] is zero, ctnetlink_new_conntrack will free allocated ct and return, so move it to outside to optimize this situation. Signed-off-by: Haishuang Yan <yanhaishu...@cmss.chinamobile.com> --- net/netfilter/nf_conntrack_netlink.c | 5 + 1 file changed, 1 insertion