Skip to content

Commit

Permalink
netfilter: xtables: shorten up return clause
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jan Engelhardt committed Mar 25, 2010
1 parent 4a5a5c7 commit f95c74e
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 30 deletions.
7 changes: 2 additions & 5 deletions net/ipv4/netfilter/ipt_CLUSTERIP.c
Original file line number Diff line number Diff line change
Expand Up @@ -403,13 +403,10 @@ 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;
return ret;
}

/* drop reference count of cluster config when rule is deleted */
Expand Down
6 changes: 2 additions & 4 deletions net/netfilter/xt_CONNSECMARK.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,10 @@ 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;
return ret;
}

static void connsecmark_tg_destroy(const struct xt_tgdtor_param *par)
Expand Down
7 changes: 2 additions & 5 deletions net/netfilter/xt_connbytes.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,10 @@ 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;
return ret;
}

static void connbytes_mt_destroy(const struct xt_mtdtor_param *par)
Expand Down
12 changes: 4 additions & 8 deletions net/netfilter/xt_connmark.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,10 @@ 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;
return ret;
}

static void connmark_tg_destroy(const struct xt_tgdtor_param *par)
Expand All @@ -111,12 +109,10 @@ 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;
return ret;
}

static void connmark_mt_destroy(const struct xt_mtdtor_param *par)
Expand Down
6 changes: 2 additions & 4 deletions net/netfilter/xt_conntrack.c
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,10 @@ 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;
return ret;
}

static void conntrack_mt_destroy(const struct xt_mtdtor_param *par)
Expand Down
6 changes: 2 additions & 4 deletions net/netfilter/xt_state.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,10 @@ static int state_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;
return ret;
}

static void state_mt_destroy(const struct xt_mtdtor_param *par)
Expand Down

0 comments on commit f95c74e

Please sign in to comment.