styles warned by checkpatch.pl fixed

diff --git a/include/libipset/types.h b/include/libipset/types.h
index aac5465874f25ee08dc6e193026bec72aa1ba9e4..c98855e14713dc740093748dc22b77a52882a88f 100644 (file)
--- a/include/libipset/types.h
+++ b/include/libipset/types.h
@@ -82,7 +82,6 @@ struct ipset_type {
        const char *usage;                      /* terse usage */
        void (*usagefn)(void);                  /* additional usage */
        const char *description;                /* short revision description */
-
        struct ipset_type *next;
        const char *alias[];                    /* name alias(es) */
 };

diff --git a/kernel/include/linux/netfilter/ipset/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h
index b8007a9189be010fd22b48a375fd564f7b57eb49..05642d26246aa247100e5b06f638c1f1627eb806 100644 (file)
--- a/kernel/include/linux/netfilter/ipset/ip_set.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set.h
@@ -326,6 +326,7 @@ ip_set_update_counter(struct ip_set_counter *counter,
 /* RCU-safe assign value */
 #define IP_SET_RCU_ASSIGN(ptr, value)  \
 do {                                   \
+       /* Safe assign numeric types */ \
        smp_wmb();                      \
        *(ptr) = value;                 \
 } while (0)
@@ -384,10 +385,10 @@ ip_set_put_skbinfo(struct sk_buff *skb, struct ip_set_skbinfo *skbinfo)
                              cpu_to_be64((u64)skbmark << 32 |
                                          skbmarkmask))) ||
               (skbprio &&
-               nla_put_net32(skb, IPSET_ATTR_SKBPRIO,
+               nla_put_net32(skb, IPSET_ATTR_SKBPRIO,
                              cpu_to_be32(skbprio))) ||
               (skbqueue &&
-               nla_put_net16(skb, IPSET_ATTR_SKBQUEUE,
+               nla_put_net16(skb, IPSET_ATTR_SKBQUEUE,
                             cpu_to_be16(skbqueue)));
 
 }
@@ -585,8 +586,8 @@ ip_set_put_extensions(struct sk_buff *skb, const struct ip_set *set,
                unsigned long *timeout = ext_timeout(e, set);
 
                if (nla_put_net32(skb, IPSET_ATTR_TIMEOUT,
-                         htonl(active ? ip_set_timeout_get(timeout)
-                               : *timeout)))
+                       htonl(active ? ip_set_timeout_get(timeout)
+                             : *timeout)))
                        return -EMSGSIZE;
        }
        if (SET_WITH_COUNTER(set) &&

diff --git a/kernel/net/netfilter/ipset/ip_set_core.c b/kernel/net/netfilter/ipset/ip_set_core.c
index 1f84e640f45174f3a576e5b2d01e584030bb654e..b0b9611c83049e42c580f30773ac876bb15776ad 100644 (file)
--- a/kernel/net/netfilter/ipset/ip_set_core.c
+++ b/kernel/net/netfilter/ipset/ip_set_core.c
@@ -396,6 +396,7 @@ ip_set_get_extensions(struct ip_set *set, struct nlattr *tb[],
                      struct ip_set_ext *ext)
 {
        u64 fullmark;
+
        if (tb[IPSET_ATTR_TIMEOUT]) {
                if (!(set->extensions & IPSET_EXT_TIMEOUT))
                        return -IPSET_ERR_TIMEOUT;
@@ -909,7 +910,7 @@ ip_set_create(struct sock *ctnl, struct sk_buff *skb,
                        /* Wraparound */
                        goto cleanup;
 
-               list = kzalloc(sizeof(struct ip_set *) * i, GFP_KERNEL);
+               list = kcalloc(i, sizeof(struct ip_set *), GFP_KERNEL);
                if (!list)
                        goto cleanup;
                /* nfnl mutex is held, both lists are valid */
@@ -1185,6 +1186,7 @@ static int
 ip_set_dump_done(struct netlink_callback *cb)
 {
        struct ip_set_net *inst = (struct ip_set_net *)cb->args[IPSET_CB_NET];
+
        if (cb->args[IPSET_CB_ARG0]) {
                pr_debug("release set %s\n",
                         ip_set(inst, cb->args[IPSET_CB_INDEX])->name);
@@ -1222,7 +1224,7 @@ dump_init(struct netlink_callback *cb, struct ip_set_net *inst)
 
        /* cb->args[IPSET_CB_NET]:      net namespace
         *         [IPSET_CB_DUMP]:     dump single set/all sets
-        *         [IPSET_CB_INDEX]:    set index
+        *         [IPSET_CB_INDEX]:    set index
         *         [IPSET_CB_ARG0]:     type specific
         */
 
@@ -1241,6 +1243,7 @@ dump_init(struct netlink_callback *cb, struct ip_set_net *inst)
 
        if (cda[IPSET_ATTR_FLAGS]) {
                u32 f = ip_set_get_h32(cda[IPSET_ATTR_FLAGS]);
+
                dump_type |= (f << 16);
        }
        cb->args[IPSET_CB_NET] = (unsigned long)inst;
@@ -1884,6 +1887,7 @@ ip_set_sockfn_get(struct sock *sk, int optval, void __user *user, int *len)
        if (*op < IP_SET_OP_VERSION) {
                /* Check the version at the beginning of operations */
                struct ip_set_req_version *req_version = data;
+
                if (req_version->version != IPSET_PROTOCOL) {
                        ret = -EPROTO;
                        goto done;
@@ -1997,7 +2001,7 @@ ip_set_net_init(struct net *net)
        if (inst->ip_set_max >= IPSET_INVALID_ID)
                inst->ip_set_max = IPSET_INVALID_ID - 1;
 
-       list = kzalloc(sizeof(struct ip_set *) * inst->ip_set_max, GFP_KERNEL);
+       list = kcalloc(inst->ip_set_max, sizeof(struct ip_set *), GFP_KERNEL);
        if (!list)
 #ifdef HAVE_NET_OPS_ID
                return -ENOMEM;
@@ -2050,6 +2054,7 @@ static int __init
 ip_set_init(void)
 {
        int ret = nfnetlink_subsys_register(&ip_set_netlink_subsys);
+
        if (ret != 0) {
                pr_err("ip_set: cannot register with nfnetlink.\n");
                return ret;

diff --git a/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c b/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c
index b6012ad9278113e43c98e8615a0694ef9c30c48b..3d07f9308a71c655734eae9bee557b141622976a 100644 (file)
--- a/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c
+++ b/kernel/net/netfilter/ipset/ip_set_hash_ipportnet.c
@@ -224,6 +224,7 @@ hash_ipportnet4_uadt(struct ip_set *set, struct nlattr *tb[],
 
        if (tb[IPSET_ATTR_CADT_FLAGS]) {
                u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
+
                if (cadt_flags & IPSET_FLAG_NOMATCH)
                        flags |= (IPSET_FLAG_NOMATCH << 16);
        }
@@ -485,6 +486,7 @@ hash_ipportnet6_uadt(struct ip_set *set, struct nlattr *tb[],
 
        if (tb[IPSET_ATTR_CADT_FLAGS]) {
                u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
+
                if (cadt_flags & IPSET_FLAG_NOMATCH)
                        flags |= (IPSET_FLAG_NOMATCH << 16);
        }

diff --git a/kernel/net/netfilter/ipset/ip_set_hash_net.c b/kernel/net/netfilter/ipset/ip_set_hash_net.c
index 6b3ac10ac2f18718bda3b1b1f4108fa347eda377..cb95064835e8019321e7a0992b7ba342635f1f3f 100644 (file)
--- a/kernel/net/netfilter/ipset/ip_set_hash_net.c
+++ b/kernel/net/netfilter/ipset/ip_set_hash_net.c
@@ -173,6 +173,7 @@ hash_net4_uadt(struct ip_set *set, struct nlattr *tb[],
 
        if (tb[IPSET_ATTR_CADT_FLAGS]) {
                u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
+
                if (cadt_flags & IPSET_FLAG_NOMATCH)
                        flags |= (IPSET_FLAG_NOMATCH << 16);
        }
@@ -180,7 +181,7 @@ hash_net4_uadt(struct ip_set *set, struct nlattr *tb[],
        if (adt == IPSET_TEST || !tb[IPSET_ATTR_IP_TO]) {
                e.ip = htonl(ip & ip_set_hostmask(e.cidr));
                ret = adtfn(set, &e, &ext, &ext, flags);
-               return ip_set_enomatch(ret, flags, adt, set) ? -ret:
+               return ip_set_enomatch(ret, flags, adt, set) ? -ret :
                       ip_set_eexist(ret, flags) ? 0 : ret;
        }
 
@@ -348,6 +349,7 @@ hash_net6_uadt(struct ip_set *set, struct nlattr *tb[],
 
        if (tb[IPSET_ATTR_CADT_FLAGS]) {
                u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
+
                if (cadt_flags & IPSET_FLAG_NOMATCH)
                        flags |= (IPSET_FLAG_NOMATCH << 16);
        }

diff --git a/kernel/net/netfilter/ipset/ip_set_hash_netiface.c b/kernel/net/netfilter/ipset/ip_set_hash_netiface.c
index d8a53ec813dddce9580df9fcacf11c08d028f6ab..d7bdb06ecca08cf0e3fdca2a41f0ad173e5ee0cb 100644 (file)
--- a/kernel/net/netfilter/ipset/ip_set_hash_netiface.c
+++ b/kernel/net/netfilter/ipset/ip_set_hash_netiface.c
@@ -218,6 +218,7 @@ hash_netiface4_uadt(struct ip_set *set, struct nlattr *tb[],
 
        if (tb[IPSET_ATTR_CADT_FLAGS]) {
                u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
+
                if (cadt_flags & IPSET_FLAG_PHYSDEV)
                        e.physdev = 1;
                if (cadt_flags & IPSET_FLAG_NOMATCH)
@@ -433,6 +434,7 @@ hash_netiface6_uadt(struct ip_set *set, struct nlattr *tb[],
 
        if (tb[IPSET_ATTR_CADT_FLAGS]) {
                u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
+
                if (cadt_flags & IPSET_FLAG_PHYSDEV)
                        e.physdev = 1;
                if (cadt_flags & IPSET_FLAG_NOMATCH)

diff --git a/kernel/net/netfilter/ipset/ip_set_hash_netnet.c b/kernel/net/netfilter/ipset/ip_set_hash_netnet.c
index ea8772afb6e70c4d366220fc7654f64793e4ef88..ea4d06b4b3adf12fe8cad28fe7d7042e767bc77f 100644 (file)
--- a/kernel/net/netfilter/ipset/ip_set_hash_netnet.c
+++ b/kernel/net/netfilter/ipset/ip_set_hash_netnet.c
@@ -204,6 +204,7 @@ hash_netnet4_uadt(struct ip_set *set, struct nlattr *tb[],
 
        if (tb[IPSET_ATTR_CADT_FLAGS]) {
                u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
+
                if (cadt_flags & IPSET_FLAG_NOMATCH)
                        flags |= (IPSET_FLAG_NOMATCH << 16);
        }
@@ -432,6 +433,7 @@ hash_netnet6_uadt(struct ip_set *set, struct nlattr *tb[],
 
        if (tb[IPSET_ATTR_CADT_FLAGS]) {
                u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
+
                if (cadt_flags & IPSET_FLAG_NOMATCH)
                        flags |= (IPSET_FLAG_NOMATCH << 16);
        }

diff --git a/kernel/net/netfilter/ipset/ip_set_hash_netport.c b/kernel/net/netfilter/ipset/ip_set_hash_netport.c
index c0ddb58d19dcca43818ea734cbc1ca64ef7eb1c9..bc7a1c2f1ea2ec4ef6e77d4c37b3f37edd6d2cf9 100644 (file)
--- a/kernel/net/netfilter/ipset/ip_set_hash_netport.c
+++ b/kernel/net/netfilter/ipset/ip_set_hash_netport.c
@@ -215,6 +215,7 @@ hash_netport4_uadt(struct ip_set *set, struct nlattr *tb[],
 
        if (tb[IPSET_ATTR_CADT_FLAGS]) {
                u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
+
                if (cadt_flags & IPSET_FLAG_NOMATCH)
                        flags |= (IPSET_FLAG_NOMATCH << 16);
        }
@@ -436,6 +437,7 @@ hash_netport6_uadt(struct ip_set *set, struct nlattr *tb[],
 
        if (tb[IPSET_ATTR_CADT_FLAGS]) {
                u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
+
                if (cadt_flags & IPSET_FLAG_NOMATCH)
                        flags |= (IPSET_FLAG_NOMATCH << 16);
        }

diff --git a/kernel/net/netfilter/ipset/ip_set_hash_netportnet.c b/kernel/net/netfilter/ipset/ip_set_hash_netportnet.c
index bfaa94c7baa79300da255f9f7761f888b79136e7..f98d3f6defd34026547dace790371fb11aebed00 100644 (file)
--- a/kernel/net/netfilter/ipset/ip_set_hash_netportnet.c
+++ b/kernel/net/netfilter/ipset/ip_set_hash_netportnet.c
@@ -239,6 +239,7 @@ hash_netportnet4_uadt(struct ip_set *set, struct nlattr *tb[],
 
        if (tb[IPSET_ATTR_CADT_FLAGS]) {
                u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
+
                if (cadt_flags & IPSET_FLAG_NOMATCH)
                        flags |= (IPSET_FLAG_NOMATCH << 16);
        }
@@ -515,6 +516,7 @@ hash_netportnet6_uadt(struct ip_set *set, struct nlattr *tb[],
 
        if (tb[IPSET_ATTR_CADT_FLAGS]) {
                u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
+
                if (cadt_flags & IPSET_FLAG_NOMATCH)
                        flags |= (IPSET_FLAG_NOMATCH << 16);
        }

diff --git a/kernel/net/netfilter/xt_set.c b/kernel/net/netfilter/xt_set.c
index 39eee43ecd6e3874ff5baf2a1837e7723a39b9c5..9953a7b7194203e03fe141b7b55d721e268d18b0 100644 (file)
--- a/kernel/net/netfilter/xt_set.c
+++ b/kernel/net/netfilter/xt_set.c
@@ -40,7 +40,7 @@ MODULE_ALIAS("ip6t_SET");
 #define        FTYPE           int
 #endif
 #ifdef HAVE_XT_MTCHK_PARAM_STRUCT_NET
-#define XT_PAR_NET(par)        (par)->net
+#define XT_PAR_NET(par)        ((par)->net)
 #else
 #define        XT_PAR_NET(par) NULL
 #endif
@@ -70,6 +70,7 @@ static bool
 set_match_v0(const struct sk_buff *skb, CONST struct xt_action_param *par)
 {
        const struct xt_set_info_match_v0 *info = par->matchinfo;
+
        ADT_OPT(opt, par->family, info->match_set.u.compat.dim,
                info->match_set.u.compat.flags, 0, UINT_MAX);
 
@@ -132,6 +133,7 @@ static bool
 set_match_v1(const struct sk_buff *skb, CONST struct xt_action_param *par)
 {
        const struct xt_set_info_match_v1 *info = par->matchinfo;
+
        ADT_OPT(opt, par->family, info->match_set.dim,
                info->match_set.flags, 0, UINT_MAX);
 
@@ -196,6 +198,7 @@ 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;
+
        ADT_OPT(opt, par->family, info->match_set.dim,
                info->match_set.flags, info->flags, UINT_MAX);
        int ret;
@@ -278,6 +281,7 @@ static unsigned int
 set_target_v0(struct sk_buff *skb, const struct xt_action_param *par)
 {
        const struct xt_set_info_target_v0 *info = par->targinfo;
+
        ADT_OPT(add_opt, par->family, info->add_set.u.compat.dim,
                info->add_set.u.compat.flags, 0, UINT_MAX);
        ADT_OPT(del_opt, par->family, info->del_set.u.compat.dim,
@@ -355,6 +359,7 @@ static unsigned int
 set_target_v1(struct sk_buff *skb, const struct xt_action_param *par)
 {
        const struct xt_set_info_target_v1 *info = par->targinfo;
+
        ADT_OPT(add_opt, par->family, info->add_set.dim,
                info->add_set.flags, 0, UINT_MAX);
        ADT_OPT(del_opt, par->family, info->del_set.dim,
@@ -428,6 +433,7 @@ static unsigned int
 set_target_v2(struct sk_buff *skb, const struct xt_action_param *par)
 {
        const struct xt_set_info_target_v2 *info = par->targinfo;
+
        ADT_OPT(add_opt, par->family, info->add_set.dim,
                info->add_set.flags, info->flags, info->timeout);
        ADT_OPT(del_opt, par->family, info->del_set.dim,
@@ -456,6 +462,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;
+
        ADT_OPT(add_opt, par->family, info->add_set.dim,
                info->add_set.flags, info->flags, info->timeout);
        ADT_OPT(del_opt, par->family, info->del_set.dim,

diff --git a/kernel/net/sched/em_ipset.c b/kernel/net/sched/em_ipset.c
index 2729d7e2e32dd0da612e7f18bf012f879abda2f6..53185d55fe863143fc98b02d7e8a01d66e68fda2 100644 (file)
--- a/kernel/net/sched/em_ipset.c
+++ b/kernel/net/sched/em_ipset.c
@@ -57,6 +57,7 @@ static void em_ipset_destroy(struct tcf_proto *p, struct tcf_ematch *em)
 #endif
 {
        const struct xt_set_info *set = (const void *) em->data;
+
        if (set) {
 #ifdef HAVE_TCF_EMATCH_STRUCT_NET
                ip_set_nfnl_put(em->net, set->index);
@@ -87,7 +88,9 @@ static int em_ipset_match(struct sk_buff *skb, struct tcf_ematch *em,
                acpar.family = NFPROTO_IPV6;
                if (!pskb_network_may_pull(skb, sizeof(struct ipv6hdr)))
                        return 0;
-               /* doesn't call ipv6_find_hdr() because ipset doesn't use thoff, yet */
+               /* doesn't call ipv6_find_hdr() because ipset doesn't use
+                * thoff, yet
+                */
                acpar.thoff = sizeof(struct ipv6hdr);
                break;
        default: