Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[linux-drm-fsl-dcu.git] / net / netfilter / xt_CONNSECMARK.c

diff --git a/net/netfilter/xt_CONNSECMARK.c b/net/netfilter/xt_CONNSECMARK.c
index 105a62e985d379e5b1060c7e0b8c21a6f337bdf4..e04dc282e3bba104d361cbc07e450ffdf3c2c3a0 100644 (file)
--- a/net/netfilter/xt_CONNSECMARK.c
+++ b/net/netfilter/xt_CONNSECMARK.c
@@ -64,7 +64,7 @@ static void secmark_restore(struct sk_buff *skb)
 }
 
 static unsigned int
-connsecmark_tg(struct sk_buff *skb, const struct xt_target_param *par)
+connsecmark_tg(struct sk_buff *skb, const struct xt_action_param *par)
 {
        const struct xt_connsecmark_target_info *info = par->targinfo;
 
@@ -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)