Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f95c74e3 authored by Jan Engelhardt's avatar Jan Engelhardt
Browse files

netfilter: xtables: shorten up return clause 



The return value of nf_ct_l3proto_get can directly be returned even in
the case of success.

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent 4a5a5c73

net/ipv4/netfilter/ipt_CLUSTERIP.c

+2 −5
Original line number Diff line number Diff line
@@ -403,15 +403,12 @@ static int clusterip_tg_check(const struct xt_tgchk_param *par) 
	cipinfo->config = config;



	ret = nf_ct_l3proto_try_module_get(par->family);

	if (ret < 0) {

	if (ret < 0)

		pr_info("cannot load conntrack support for proto=%u\n",

			par->family);

	return ret;

}



	return 0;

}



/* drop reference count of cluster config when rule is deleted */

static void clusterip_tg_destroy(const struct xt_tgdtor_param *par)

{

net/netfilter/xt_CONNSECMARK.c

+2 −4
Original line number Diff line number Diff line
@@ -107,13 +107,11 @@ static int connsecmark_tg_check(const struct xt_tgchk_param *par) 
	}



	ret = nf_ct_l3proto_try_module_get(par->family);

	if (ret < 0) {

	if (ret < 0)

		pr_info("cannot load conntrack support for proto=%u\n",

			par->family);

	return ret;

}

	return 0;

}



static void connsecmark_tg_destroy(const struct xt_tgdtor_param *par)

{

net/netfilter/xt_connbytes.c

+2 −5
Original line number Diff line number Diff line
@@ -109,15 +109,12 @@ static int connbytes_mt_check(const struct xt_mtchk_param *par) 
		return -EINVAL;



	ret = nf_ct_l3proto_try_module_get(par->family);

	if (ret < 0) {

	if (ret < 0)

		pr_info("cannot load conntrack support for proto=%u\n",

			par->family);

	return ret;

}



	return 0;

}



static void connbytes_mt_destroy(const struct xt_mtdtor_param *par)

{

	nf_ct_l3proto_module_put(par->family);

net/netfilter/xt_connmark.c

+4 −8
Original line number Diff line number Diff line
@@ -79,13 +79,11 @@ static int connmark_tg_check(const struct xt_tgchk_param *par) 
	int ret;



	ret = nf_ct_l3proto_try_module_get(par->family);

	if (ret < 0) {

	if (ret < 0)

		pr_info("cannot load conntrack support for proto=%u\n",

			par->family);

	return ret;

}

	return 0;

}



static void connmark_tg_destroy(const struct xt_tgdtor_param *par)

{
@@ -111,13 +109,11 @@ static int connmark_mt_check(const struct xt_mtchk_param *par) 
	int ret;



	ret = nf_ct_l3proto_try_module_get(par->family);

	if (ret < 0) {

	if (ret < 0)

		pr_info("cannot load conntrack support for proto=%u\n",

			par->family);

	return ret;

}

	return 0;

}



static void connmark_mt_destroy(const struct xt_mtdtor_param *par)

{

net/netfilter/xt_conntrack.c

+2 −4
Original line number Diff line number Diff line
@@ -211,13 +211,11 @@ static int conntrack_mt_check(const struct xt_mtchk_param *par) 
	int ret;



	ret = nf_ct_l3proto_try_module_get(par->family);

	if (ret < 0) {

	if (ret < 0)

		pr_info("cannot load conntrack support for proto=%u\n",

			par->family);

	return ret;

}

	return 0;

}



static void conntrack_mt_destroy(const struct xt_mtdtor_param *par)

{