redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

netfilter: xtables: shorten up return clause

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

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
This commit is contained in:
Jan Engelhardt 2010-03-21 04:05:56 +01:00
parent 4a5a5c73b7
commit f95c74e33e
6 changed files with 14 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
net/ipv4/netfilter/ipt_CLUSTERIP.c
View file

@ -403,15 +403,12 @@ static int clusterip_tg_check(const struct xt_tgchk_param *par)
cipinfo->config = config; cipinfo->config = config;
ret = nf_ct_l3proto_try_module_get(par->family); 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", pr_info("cannot load conntrack support for proto=%u\n",
par->family); par->family);
return ret; return ret;
} }
return 0;
}
/* drop reference count of cluster config when rule is deleted */ /* drop reference count of cluster config when rule is deleted */
static void clusterip_tg_destroy(const struct xt_tgdtor_param *par) static void clusterip_tg_destroy(const struct xt_tgdtor_param *par)
{ {

4
net/netfilter/xt_CONNSECMARK.c
View file

@ -107,13 +107,11 @@ static int connsecmark_tg_check(const struct xt_tgchk_param *par)
} }
ret = nf_ct_l3proto_try_module_get(par->family); 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", pr_info("cannot load conntrack support for proto=%u\n",
par->family); par->family);
return ret; return ret;
} }
return 0;
}
static void connsecmark_tg_destroy(const struct xt_tgdtor_param *par) static void connsecmark_tg_destroy(const struct xt_tgdtor_param *par)
{ {

5
net/netfilter/xt_connbytes.c
View file

@ -109,15 +109,12 @@ static int connbytes_mt_check(const struct xt_mtchk_param *par)
return -EINVAL; return -EINVAL;
ret = nf_ct_l3proto_try_module_get(par->family); 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", pr_info("cannot load conntrack support for proto=%u\n",
par->family); par->family);
return ret; return ret;
} }
return 0;
}
static void connbytes_mt_destroy(const struct xt_mtdtor_param *par) static void connbytes_mt_destroy(const struct xt_mtdtor_param *par)
{ {
nf_ct_l3proto_module_put(par->family); nf_ct_l3proto_module_put(par->family);

8
net/netfilter/xt_connmark.c
View file

@ -79,13 +79,11 @@ static int connmark_tg_check(const struct xt_tgchk_param *par)
int ret; int ret;
ret = nf_ct_l3proto_try_module_get(par->family); 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", pr_info("cannot load conntrack support for proto=%u\n",
par->family); par->family);
return ret; return ret;
} }
return 0;
}
static void connmark_tg_destroy(const struct xt_tgdtor_param *par) 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; int ret;
ret = nf_ct_l3proto_try_module_get(par->family); 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", pr_info("cannot load conntrack support for proto=%u\n",
par->family); par->family);
return ret; return ret;
} }
return 0;
}
static void connmark_mt_destroy(const struct xt_mtdtor_param *par) static void connmark_mt_destroy(const struct xt_mtdtor_param *par)
{ {

4
net/netfilter/xt_conntrack.c
View file

@ -211,13 +211,11 @@ static int conntrack_mt_check(const struct xt_mtchk_param *par)
int ret; int ret;
ret = nf_ct_l3proto_try_module_get(par->family); 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", pr_info("cannot load conntrack support for proto=%u\n",
par->family); par->family);
return ret; return ret;
} }
return 0;
}
static void conntrack_mt_destroy(const struct xt_mtdtor_param *par) static void conntrack_mt_destroy(const struct xt_mtdtor_param *par)
{ {

4
net/netfilter/xt_state.c
View file

@ -42,13 +42,11 @@ static int state_mt_check(const struct xt_mtchk_param *par)
int ret; int ret;
ret = nf_ct_l3proto_try_module_get(par->family); 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", pr_info("cannot load conntrack support for proto=%u\n",
par->family); par->family);
return ret; return ret;
} }
return 0;
}
static void state_mt_destroy(const struct xt_mtdtor_param *par) static void state_mt_destroy(const struct xt_mtdtor_param *par)
{ {