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: Jan Engelhardt <jengelh@medozas.de>

diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 1faf5fa06ac8807d6c5cba860a79495ed08499a0..5d70c43302bbf58f07f2933ed7221b7423d62898 100644 (file)
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -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 */

diff --git a/net/netfilter/xt_CONNSECMARK.c b/net/netfilter/xt_CONNSECMARK.c
index 105a62e985d379e5b1060c7e0b8c21a6f337bdf4..e953e302141d95991c812de136672b72114e8f32 100644 (file)
--- a/net/netfilter/xt_CONNSECMARK.c
+++ b/net/netfilter/xt_CONNSECMARK.c
@@ -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)

diff --git a/net/netfilter/xt_connbytes.c b/net/netfilter/xt_connbytes.c
index 2ff332ecc342a5092f7830dd2a4613a0907d11cb..ff738a5f963a72e4591468cfe5c9e9d5fc7844c1 100644 (file)
--- a/net/netfilter/xt_connbytes.c
+++ b/net/netfilter/xt_connbytes.c
@@ -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)

diff --git a/net/netfilter/xt_connmark.c b/net/netfilter/xt_connmark.c
index 71e38a1fd6569150fe8013082cd74f52da2392a3..ae1015484ae2ed01a6cb1d5d6b0b471a893cf81c 100644 (file)
--- a/net/netfilter/xt_connmark.c
+++ b/net/netfilter/xt_connmark.c
@@ -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)
@@ -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)

diff --git a/net/netfilter/xt_conntrack.c b/net/netfilter/xt_conntrack.c
index e0bcf8d2cf33333a8840787a1d41effc101f1182..3348706ce56d306bc12cc11e0866567dc47a8d57 100644 (file)
--- a/net/netfilter/xt_conntrack.c
+++ b/net/netfilter/xt_conntrack.c
@@ -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)

diff --git a/net/netfilter/xt_state.c b/net/netfilter/xt_state.c
index 2b75230d15ca3800ab3b322eda96d3293b2c3c49..be00d7b1f53b3cc6728d3f84dd209c5f6e491ea6 100644 (file)
--- a/net/netfilter/xt_state.c
+++ b/net/netfilter/xt_state.c
@@ -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)