diff options
| author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2016-10-11 22:37:18 +0200 |
|---|---|---|
| committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2016-10-11 22:37:18 +0200 |
| commit | 464f839f9c958f470f4f4d66a82b4298c49bc84d (patch) | |
| tree | c5e34c5f378575eb9351350bf284cd752d124492 /kernel/net | |
| parent | c71fc214fe8e134d6e8ffeed4043bcb4320e48d4 (diff) | |
Fix coding styles reported by checkpatch.pl, already in kernel
Diffstat (limited to 'kernel/net')
| -rw-r--r-- | kernel/net/netfilter/xt_set.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/net/netfilter/xt_set.c b/kernel/net/netfilter/xt_set.c index 10196ce..a0780b3 100644 --- a/kernel/net/netfilter/xt_set.c +++ b/kernel/net/netfilter/xt_set.c @@ -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) |