[PATCH openEuler-1.0-LTS v2 2/7] netfilter: conntrack: remove two args from resolve_clash