]> granicus.if.org Git - ipset/commitdiff
Fix coding styles reported by checkpatch.pl, already in kernel
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Tue, 11 Oct 2016 20:37:18 +0000 (22:37 +0200)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Tue, 11 Oct 2016 20:37:18 +0000 (22:37 +0200)
kernel/net/netfilter/xt_set.c

index 10196cee664ed131b23b69c9838eca7de77cf537..a0780b3b092a69276143c75b54dca4f64794e882 100644 (file)
@@ -199,10 +199,10 @@ static bool
 set_match_v3(const struct sk_buff *skb, CONST struct xt_action_param *par)
 {
        const struct xt_set_info_match_v3 *info = par->matchinfo;
+       int ret;
 
        ADT_OPT(opt, par->family, info->match_set.dim,
                info->match_set.flags, info->flags, UINT_MAX);
-       int ret;
 
        if (info->packets.op != IPSET_COUNTER_NONE ||
            info->bytes.op != IPSET_COUNTER_NONE)
@@ -246,10 +246,10 @@ static bool
 set_match_v4(const struct sk_buff *skb, CONST struct xt_action_param *par)
 {
        const struct xt_set_info_match_v4 *info = par->matchinfo;
+       int ret;
 
        ADT_OPT(opt, par->family, info->match_set.dim,
                info->match_set.flags, info->flags, UINT_MAX);
-       int ret;
 
        if (info->packets.op != IPSET_COUNTER_NONE ||
            info->bytes.op != IPSET_COUNTER_NONE)
@@ -466,6 +466,7 @@ static unsigned int
 set_target_v3(struct sk_buff *skb, const struct xt_action_param *par)
 {
        const struct xt_set_info_target_v3 *info = par->targinfo;
+       int ret;
 
        ADT_OPT(add_opt, par->family, info->add_set.dim,
                info->add_set.flags, info->flags, info->timeout);
@@ -474,8 +475,6 @@ set_target_v3(struct sk_buff *skb, const struct xt_action_param *par)
        ADT_OPT(map_opt, par->family, info->map_set.dim,
                info->map_set.flags, 0, UINT_MAX);
 
-       int ret;
-
        /* Normalize to fit into jiffies */
        if (add_opt.ext.timeout != IPSET_NO_TIMEOUT &&
            add_opt.ext.timeout > UINT_MAX / MSEC_PER_SEC)