Fix trailing whitespaces and pr_* messages

Some trailing whitespace slipped in, those are removed. With the deleted
ip_set_kernel.h, the pr_* messages lost the trailing "\n" character.
The messages were completed with it.

diff --git a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
index cee22d629e2ac125af5db0c62d13380e42293caf..8d4f2590916ff9e5a72106ba23c4720abd3570b7 100644 (file)
--- a/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_ahash.h
@@ -88,7 +88,7 @@ add_cidr(struct ip_set_hash *h, u8 cidr, u8 host_mask)
 
        ++h->nets[cidr-1].nets;
 
-       pr_debug("add_cidr added %u: %u", cidr, h->nets[cidr-1].nets);
+       pr_debug("add_cidr added %u: %u\n", cidr, h->nets[cidr-1].nets);
 
        if (h->nets[cidr-1].nets > 1)
                return;
@@ -110,7 +110,7 @@ del_cidr(struct ip_set_hash *h, u8 cidr, u8 host_mask)
 
        --h->nets[cidr-1].nets;
 
-       pr_debug("del_cidr deleted %u: %u", cidr, h->nets[cidr-1].nets);
+       pr_debug("del_cidr deleted %u: %u\n", cidr, h->nets[cidr-1].nets);
 
        if (h->nets[cidr-1].nets != 0)
                return;
@@ -340,7 +340,7 @@ retry:
        /* Give time to other readers of the set */
        synchronize_rcu_bh();
 
-       pr_debug("set %s resized from %u (%p) to %u (%p)", set->name,
+       pr_debug("set %s resized from %u (%p) to %u (%p)\n", set->name,
                 orig->htable_bits, orig, t->htable_bits, t);
        ahash_destroy(orig);
 
@@ -447,7 +447,7 @@ type_pf_test_cidrs(struct ip_set *set, struct type_pf_elem *d, u32 timeout)
        u32 key;
        u8 host_mask = SET_HOST_MASK(set->family);
 
-       pr_debug("test by nets");
+       pr_debug("test by nets\n");
        for (; j < host_mask && h->nets[j].cidr; j++) {
                type_pf_data_netmask(d, h->nets[j].cidr);
                key = HKEY(d, h->initval, t->htable_bits);
@@ -546,14 +546,14 @@ type_pf_list(const struct ip_set *set,
        atd = ipset_nest_start(skb, IPSET_ATTR_ADT);
        if (!atd)
                return -EFAULT;
-       pr_debug("list hash set %s", set->name);
+       pr_debug("list hash set %s\n", set->name);
        for (; cb->args[2] < jhash_size(t->htable_bits); cb->args[2]++) {
                incomplete = skb_tail_pointer(skb);
                n = hbucket(t, cb->args[2]);
-               pr_debug("cb->args[2]: %lu, t %p n %p", cb->args[2], t, n); 
+               pr_debug("cb->args[2]: %lu, t %p n %p\n", cb->args[2], t, n);
                for (i = 0; i < n->pos; i++) {
                        data = ahash_data(n, i);
-                       pr_debug("list hash %lu hbucket %p i %u, data %p",
+                       pr_debug("list hash %lu hbucket %p i %u, data %p\n",
                                 cb->args[2], n, i, data);
                        nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
                        if (!nested) {
@@ -686,7 +686,7 @@ type_pf_expire(struct ip_set_hash *h)
                for (j = 0; j < n->pos; j++) {
                        data = ahash_tdata(n, j);
                        if (type_pf_data_expired(data)) {
-                               pr_debug("expired %u/%u", i, j);
+                               pr_debug("expired %u/%u\n", i, j);
 #ifdef IP_SET_HASH_WITH_NETS
                                del_cidr(h, data->cidr, HOST_MASK);
 #endif
@@ -807,7 +807,7 @@ type_pf_tadd(struct ip_set *set, void *value, u32 timeout)
                                ret = -IPSET_ERR_EXIST;
                                goto out;
                        }
-               } else if (j == AHASH_MAX_SIZE + 1 && 
+               } else if (j == AHASH_MAX_SIZE + 1 &&
                           type_pf_data_expired(data))
                        j = i;
        }
@@ -952,10 +952,10 @@ type_pf_tlist(const struct ip_set *set,
                n = hbucket(t, cb->args[2]);
                for (i = 0; i < n->pos; i++) {
                        data = ahash_tdata(n, i);
-                       pr_debug("list %p %u", n, i);
+                       pr_debug("list %p %u\n", n, i);
                        if (type_pf_data_expired(data))
                                continue;
-                       pr_debug("do list %p %u", n, i);
+                       pr_debug("do list %p %u\n", n, i);
                        nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
                        if (!nested) {
                                if (cb->args[2] == first) {
@@ -1008,7 +1008,7 @@ type_pf_gc(unsigned long ul_set)
        struct ip_set *set = (struct ip_set *) ul_set;
        struct ip_set_hash *h = set->data;
 
-       pr_debug("called");
+       pr_debug("called\n");
        write_lock_bh(&set->lock);
        type_pf_expire(h);
        write_unlock_bh(&set->lock);
@@ -1027,7 +1027,7 @@ type_pf_gc_init(struct ip_set *set)
        h->gc.function = type_pf_gc;
        h->gc.expires = jiffies + IPSET_GC_PERIOD(h->timeout) * HZ;
        add_timer(&h->gc);
-       pr_debug("gc initialized, run in every %u",
+       pr_debug("gc initialized, run in every %u\n",
                 IPSET_GC_PERIOD(h->timeout));
 }
 

diff --git a/kernel/include/linux/netfilter/ipset/ip_set_getport.h b/kernel/include/linux/netfilter/ipset/ip_set_getport.h
index 33d9fbe7fa4bef052f5f513285b2e98414e19b13..694c433298b8b261585912b7551fa2a74df7aea5 100644 (file)
--- a/kernel/include/linux/netfilter/ipset/ip_set_getport.h
+++ b/kernel/include/linux/netfilter/ipset/ip_set_getport.h
@@ -1,8 +1,6 @@
 #ifndef _IP_SET_GETPORT_H
 #define _IP_SET_GETPORT_H
 
-#define IPSET_INVALID_PORT     65536
-
 extern bool ip_set_get_ip4_port(const struct sk_buff *skb, bool src,
                                __be16 *port, u8 *proto);
 extern bool ip_set_get_ip6_port(const struct sk_buff *skb, bool src,

diff --git a/kernel/ip_set_bitmap_ip.c b/kernel/ip_set_bitmap_ip.c
index f491d4e76b35c6d537d6cbba77f68ea178a71b0f..4fbb3602f24cda66cf3d3739b297d7a2ff95a732 100644 (file)
--- a/kernel/ip_set_bitmap_ip.c
+++ b/kernel/ip_set_bitmap_ip.c
@@ -655,14 +655,14 @@ bitmap_ip_create(struct ip_set *set, struct nlattr *head, int len,
                    netmask <= mask_bits)
                        return -IPSET_ERR_BITMAP_RANGE;
 
-               pr_debug("mask_bits %u, netmask %u", mask_bits, netmask);
+               pr_debug("mask_bits %u, netmask %u\n", mask_bits, netmask);
                hosts = 2 << (32 - netmask - 1);
                elements = 2 << (netmask - mask_bits - 1);
        }
        if (elements > IPSET_BITMAP_MAX_RANGE + 1)
                return -IPSET_ERR_BITMAP_RANGE_SIZE;
 
-       pr_debug("hosts %u, elements %u", hosts, elements);
+       pr_debug("hosts %u, elements %u\n", hosts, elements);
 
        if (tb[IPSET_ATTR_TIMEOUT]) {
                struct bitmap_ip_timeout *map;

diff --git a/kernel/ip_set_bitmap_port.c b/kernel/ip_set_bitmap_port.c
index c5643cdf336dea77d5c13bd600b25d793082652e..fbd0aaf4a21a189cb976317c48591650a5fda0c5 100644 (file)
--- a/kernel/ip_set_bitmap_port.c
+++ b/kernel/ip_set_bitmap_port.c
@@ -611,7 +611,7 @@ bitmap_port_create(struct ip_set *set, struct nlattr *head, int len,
                        return -ENOMEM;
 
                map->memsize = bitmap_bytes(0, last_port - first_port);
-               pr_debug("memsize: %zu", map->memsize);
+               pr_debug("memsize: %zu\n", map->memsize);
                if (!init_map_port(set, map, first_port, last_port)) {
                        kfree(map);
                        return -ENOMEM;

diff --git a/kernel/ip_set_core.c b/kernel/ip_set_core.c
index 425da112e0c0da37646e1bffae478dcf4595ee5b..aa5d12f695bae1bdd8c062381c6801242378e9c4 100644 (file)
--- a/kernel/ip_set_core.c
+++ b/kernel/ip_set_core.c
@@ -162,7 +162,7 @@ ip_set_type_register(struct ip_set_type *type)
                goto unlock;
        }
        list_add_rcu(&type->list, &ip_set_type_list);
-       pr_debug("type %s, family %s, revision %u registered.",
+       pr_debug("type %s, family %s, revision %u registered.\n",
                 type->name, family_name(type->family), type->revision);
 unlock:
        ip_set_type_unlock();
@@ -182,7 +182,7 @@ ip_set_type_unregister(struct ip_set_type *type)
                goto unlock;
        }
        list_del_rcu(&type->list);
-       pr_debug("type %s, family %s, revision %u unregistered.",
+       pr_debug("type %s, family %s, revision %u unregistered.\n",
                 type->name, family_name(type->family), type->revision);
 unlock:
        ip_set_type_unlock();
@@ -201,7 +201,7 @@ ip_set_alloc(size_t size, gfp_t gfp_mask)
                members = kzalloc(size, gfp_mask | __GFP_NOWARN);
 
        if (members) {
-               pr_debug("%p: allocated with kmalloc", members);
+               pr_debug("%p: allocated with kmalloc\n", members);
                return members;
        }
 
@@ -209,7 +209,7 @@ ip_set_alloc(size_t size, gfp_t gfp_mask)
                            PAGE_KERNEL);
        if (!members)
                return NULL;
-       pr_debug("%p: allocated with vmalloc", members);
+       pr_debug("%p: allocated with vmalloc\n", members);
 
        return members;
 }
@@ -218,7 +218,7 @@ EXPORT_SYMBOL_GPL(ip_set_alloc);
 void
 ip_set_free(void *members)
 {
-       pr_debug("%p: free with %s", members,
+       pr_debug("%p: free with %s\n", members,
                 is_vmalloc_addr(members) ? "vfree" : "kfree");
        if (is_vmalloc_addr(members))
                vfree(members);
@@ -315,7 +315,7 @@ ip_set_test(ip_set_id_t index, const struct sk_buff *skb,
        int ret = 0;
 
        BUG_ON(set == NULL || atomic_read(&set->ref) == 0);
-       pr_debug("set %s, index %u", set->name, index);
+       pr_debug("set %s, index %u\n", set->name, index);
 
        if (dim < set->type->dimension ||
            !(family == set->family || set->family == AF_UNSPEC))
@@ -327,7 +327,7 @@ ip_set_test(ip_set_id_t index, const struct sk_buff *skb,
 
        if (ret == -EAGAIN) {
                /* Type requests element to be completed */
-               pr_debug("element must be competed, ADD is triggered");
+               pr_debug("element must be competed, ADD is triggered\n");
                write_lock_bh(&set->lock);
                set->variant->kadt(set, skb, IPSET_ADD, family, dim, flags);
                write_unlock_bh(&set->lock);
@@ -347,7 +347,7 @@ ip_set_add(ip_set_id_t index, const struct sk_buff *skb,
        int ret;
 
        BUG_ON(set == NULL || atomic_read(&set->ref) == 0);
-       pr_debug("set %s, index %u", set->name, index);
+       pr_debug("set %s, index %u\n", set->name, index);
 
        if (dim < set->type->dimension ||
            !(family == set->family || set->family == AF_UNSPEC))
@@ -369,7 +369,7 @@ ip_set_del(ip_set_id_t index, const struct sk_buff *skb,
        int ret = 0;
 
        BUG_ON(set == NULL || atomic_read(&set->ref) == 0);
-       pr_debug("set %s, index %u", set->name, index);
+       pr_debug("set %s, index %u\n", set->name, index);
 
        if (dim < set->type->dimension ||
            !(family == set->family || set->family == AF_UNSPEC))
@@ -634,7 +634,7 @@ ip_set_create(struct sock *ctnl, struct sk_buff *skb,
        typename = nla_data(attr[IPSET_ATTR_TYPENAME]);
        family = nla_get_u8(attr[IPSET_ATTR_FAMILY]);
        revision = nla_get_u8(attr[IPSET_ATTR_REVISION]);
-       pr_debug("setname: %s, typename: %s, family: %s, revision: %u",
+       pr_debug("setname: %s, typename: %s, family: %s, revision: %u\n",
                 name, typename, family_name(family), revision);
 
        /*
@@ -665,7 +665,7 @@ ip_set_create(struct sock *ctnl, struct sk_buff *skb,
         * Without holding any locks, create private part.
         */
        len = attr[IPSET_ATTR_DATA] ? nla_len(attr[IPSET_ATTR_DATA]) : 0;
-       pr_debug("data len: %u", len);
+       pr_debug("data len: %u\n", len);
        ret = set->type->create(set, attr[IPSET_ATTR_DATA] ?
                                nla_data(attr[IPSET_ATTR_DATA]) : NULL, len,
                                flags);
@@ -694,7 +694,7 @@ ip_set_create(struct sock *ctnl, struct sk_buff *skb,
        /*
         * Finally! Add our shiny new set to the list, and be done.
         */
-       pr_debug("create: '%s' created with index %u!", set->name, index);
+       pr_debug("create: '%s' created with index %u!\n", set->name, index);
        ip_set_list[index] = set;
 
        return ret;
@@ -722,7 +722,7 @@ ip_set_destroy_set(ip_set_id_t index)
 {
        struct ip_set *set = ip_set_list[index];
 
-       pr_debug("set: %s",  set->name);
+       pr_debug("set: %s\n",  set->name);
        ip_set_list[index] = NULL;
 
        /* Must call it without holding any lock */
@@ -769,7 +769,7 @@ ip_set_destroy(struct sock *ctnl, struct sk_buff *skb,
 static void
 ip_set_flush_set(struct ip_set *set)
 {
-       pr_debug("set: %s",  set->name);
+       pr_debug("set: %s\n",  set->name);
 
        write_lock_bh(&set->lock);
        set->variant->flush(set);
@@ -911,7 +911,7 @@ static int
 ip_set_dump_done(struct netlink_callback *cb)
 {
        if (cb->args[2]) {
-               pr_debug("release set %s", ip_set_list[cb->args[1]]->name);
+               pr_debug("release set %s\n", ip_set_list[cb->args[1]]->name);
                __ip_set_put((ip_set_id_t) cb->args[1]);
        }
        return 0;
@@ -923,9 +923,9 @@ dump_attrs(struct nlmsghdr *nlh)
        const struct nlattr *attr;
        int rem;
 
-       pr_debug("dump nlmsg");
+       pr_debug("dump nlmsg\n");
        nlmsg_for_each_attr(attr, nlh, sizeof(struct nfgenmsg), rem) {
-               pr_debug("type: %u, len %u", nla_type(attr), attr->nla_len);
+               pr_debug("type: %u, len %u\n", nla_type(attr), attr->nla_len);
        }
 }
 
@@ -1002,10 +1002,10 @@ ip_set_dump_start(struct sk_buff *skb, struct netlink_callback *cb)
                    !((cb->args[0] == DUMP_ALL) ^
                      (set->type->features & IPSET_DUMP_LAST)))
                        continue;
-               pr_debug("List set: %s", set->name);
+               pr_debug("List set: %s\n", set->name);
                if (!cb->args[2]) {
                        /* Start listing: make sure set won't be destroyed */
-                       pr_debug("reference set");
+                       pr_debug("reference set\n");
                        __ip_set_get(index);
                }
                nlh = start_msg(skb, NETLINK_CB(cb->skb).pid,
@@ -1051,7 +1051,7 @@ nla_put_failure:
 release_refcount:
        /* If there was an error or set is done, release set */
        if (ret || !cb->args[2]) {
-               pr_debug("release set %s", ip_set_list[index]->name);
+               pr_debug("release set %s\n", ip_set_list[index]->name);
                __ip_set_put(index);
        }
 
@@ -1062,7 +1062,7 @@ release_refcount:
 out:
        if (nlh) {
                nlmsg_end(skb, nlh);
-               pr_debug("nlmsg_len: %u", nlh->nlmsg_len);
+               pr_debug("nlmsg_len: %u\n", nlh->nlmsg_len);
                dump_attrs(nlh);
        }
 
@@ -1339,7 +1339,7 @@ ip_set_type(struct sock *ctnl, struct sk_buff *skb,
        NLA_PUT_U8(skb2, IPSET_ATTR_REVISION_MIN, min);
        nlmsg_end(skb2, nlh2);
 
-       pr_debug("Send TYPE, nlmsg_len: %u", nlh2->nlmsg_len);
+       pr_debug("Send TYPE, nlmsg_len: %u\n", nlh2->nlmsg_len);
        ret = netlink_unicast(ctnl, skb2, NETLINK_CB(skb).pid, MSG_DONTWAIT);
        if (ret < 0)
                return -EFAULT;
@@ -1584,25 +1584,25 @@ ip_set_init(void)
        ip_set_list = kzalloc(sizeof(struct ip_set *) * ip_set_max,
                              GFP_KERNEL);
        if (!ip_set_list) {
-               pr_err("ip_set: Unable to create ip_set_list");
+               pr_err("ip_set: Unable to create ip_set_list\n");
                return -ENOMEM;
        }
 
        ret = nfnetlink_subsys_register(&ip_set_netlink_subsys);
        if (ret != 0) {
-               pr_err("ip_set: cannot register with nfnetlink.");
+               pr_err("ip_set: cannot register with nfnetlink.\n");
                kfree(ip_set_list);
                return ret;
        }
        ret = nf_register_sockopt(&so_set);
        if (ret != 0) {
-               pr_err("SO_SET registry failed: %d", ret);
+               pr_err("SO_SET registry failed: %d\n", ret);
                nfnetlink_subsys_unregister(&ip_set_netlink_subsys);
                kfree(ip_set_list);
                return ret;
        }
 
-       pr_notice("ip_set: protocol %u", IPSET_PROTOCOL);
+       pr_notice("ip_set: protocol %u\n", IPSET_PROTOCOL);
        return 0;
 }
 
@@ -1613,7 +1613,7 @@ ip_set_fini(void)
        nf_unregister_sockopt(&so_set);
        nfnetlink_subsys_unregister(&ip_set_netlink_subsys);
        kfree(ip_set_list);
-       pr_debug("these are the famous last words");
+       pr_debug("these are the famous last words\n");
 }
 
 module_init(ip_set_init);

diff --git a/kernel/ip_set_hash_ip.c b/kernel/ip_set_hash_ip.c
index 448d4185b0b1f300a27a714b2c9ee738d125b771..7f2c1f3db26cf68d8184e3feceea6ca6a007befb 100644 (file)
--- a/kernel/ip_set_hash_ip.c
+++ b/kernel/ip_set_hash_ip.c
@@ -383,7 +383,7 @@ hash_ip_create(struct ip_set *set, struct nlattr *head, int len, u32 flags)
        if (!(set->family == AF_INET || set->family == AF_INET6))
                return -IPSET_ERR_INVALID_FAMILY;
        netmask = set->family == AF_INET ? 32 : 128;
-       pr_debug("Create set %s with family %s",
+       pr_debug("Create set %s with family %s\n",
                 set->name, set->family == AF_INET ? "inet" : "inet6");
 
        if (nla_parse(tb, IPSET_ATTR_CREATE_MAX, head, len,
@@ -450,7 +450,7 @@ hash_ip_create(struct ip_set *set, struct nlattr *head, int len, u32 flags)
                        ? &hash_ip4_variant : &hash_ip6_variant;
        }
 
-       pr_debug("create %s hashsize %u (%u) maxelem %u: %p(%p)",
+       pr_debug("create %s hashsize %u (%u) maxelem %u: %p(%p)\n",
                 set->name, jhash_size(h->table->htable_bits),
                 h->table->htable_bits, h->maxelem, set->data, h->table);
 

diff --git a/kernel/ip_set_hash_ipport.c b/kernel/ip_set_hash_ipport.c
index 37e664a3738038716eca38715a19b99d0bc6be67..7f37192d7016d6203ae82e718d4a213759195335 100644 (file)
--- a/kernel/ip_set_hash_ipport.c
+++ b/kernel/ip_set_hash_ipport.c
@@ -531,7 +531,7 @@ hash_ipport_create(struct ip_set *set, struct nlattr *head, int len, u32 flags)
                        ? &hash_ipport4_variant : &hash_ipport6_variant;
        }
 
-       pr_debug("create %s hashsize %u (%u) maxelem %u: %p(%p)",
+       pr_debug("create %s hashsize %u (%u) maxelem %u: %p(%p)\n",
                 set->name, jhash_size(h->table->htable_bits),
                 h->table->htable_bits, h->maxelem, set->data, h->table);
 

diff --git a/kernel/ip_set_hash_ipportip.c b/kernel/ip_set_hash_ipportip.c
index 78eeb4abe2e9aa9c9a9048627363ec7d920bb53f..26dd016f192e8da6db450fbb5336c58af0f1bb14 100644 (file)
--- a/kernel/ip_set_hash_ipportip.c
+++ b/kernel/ip_set_hash_ipportip.c
@@ -550,7 +550,7 @@ hash_ipportip_create(struct ip_set *set, struct nlattr *head,
                        ? &hash_ipportip4_variant : &hash_ipportip6_variant;
        }
 
-       pr_debug("create %s hashsize %u (%u) maxelem %u: %p(%p)",
+       pr_debug("create %s hashsize %u (%u) maxelem %u: %p(%p)\n",
                 set->name, jhash_size(h->table->htable_bits),
                 h->table->htable_bits, h->maxelem, set->data, h->table);
 

diff --git a/kernel/ip_set_hash_ipportnet.c b/kernel/ip_set_hash_ipportnet.c
index d4ec935724647c7c241c48468b61bdd32575cb17..379dd00dcdb9573d4f9686e343c7d46743a323d1 100644 (file)
--- a/kernel/ip_set_hash_ipportnet.c
+++ b/kernel/ip_set_hash_ipportnet.c
@@ -230,7 +230,7 @@ hash_ipportnet4_uadt(struct ip_set *set, struct nlattr *head, int len,
 
        if (tb[IPSET_ATTR_PROTO]) {
                data.proto = nla_get_u8(tb[IPSET_ATTR_PROTO]);
-               
+
                if (data.proto == 0)
                        return -IPSET_ERR_INVALID_PROTO;
        } else
@@ -304,7 +304,7 @@ hash_ipportnet_same_set(const struct ip_set *a, const struct ip_set *b)
 {
        const struct ip_set_hash *x = a->data;
        const struct ip_set_hash *y = b->data;
-       
+
        /* Resizing changes htable_bits, so we ignore it */
        return x->maxelem == y->maxelem &&
               x->timeout == y->timeout;
@@ -394,9 +394,9 @@ static bool
 hash_ipportnet6_data_tlist(struct sk_buff *skb,
                           const struct hash_ipportnet6_elem *data)
 {
-       const struct hash_ipportnet6_telem *e = 
+       const struct hash_ipportnet6_telem *e =
                (const struct hash_ipportnet6_telem *)data;
-       
+
        NLA_PUT_IPADDR6(skb, IPSET_ATTR_IP, &e->ip);
        NLA_PUT_IPADDR6(skb, IPSET_ATTR_IP2, &data->ip2);
        NLA_PUT_NET16(skb, IPSET_ATTR_PORT, data->port);
@@ -602,7 +602,7 @@ hash_ipportnet_create(struct ip_set *set, struct nlattr *head,
 
        if (tb[IPSET_ATTR_TIMEOUT]) {
                h->timeout = ip_set_timeout_uget(tb[IPSET_ATTR_TIMEOUT]);
-               
+
                set->variant = set->family == AF_INET
                        ? &hash_ipportnet4_tvariant
                        : &hash_ipportnet6_tvariant;
@@ -615,11 +615,11 @@ hash_ipportnet_create(struct ip_set *set, struct nlattr *head,
                set->variant = set->family == AF_INET
                        ? &hash_ipportnet4_variant : &hash_ipportnet6_variant;
        }
-       
-       pr_debug("create %s hashsize %u (%u) maxelem %u: %p(%p)",
+
+       pr_debug("create %s hashsize %u (%u) maxelem %u: %p(%p)\n",
                 set->name, jhash_size(h->table->htable_bits),
                 h->table->htable_bits, h->maxelem, set->data, h->table);
-          
+
        return 0;
 }
 

diff --git a/kernel/ip_set_hash_net.c b/kernel/ip_set_hash_net.c
index bdaebb4d89808c9a9ed2b849d95e46778ca5ef64..20b30e4185d7e8701876251bc305bbec81da6d50 100644 (file)
--- a/kernel/ip_set_hash_net.c
+++ b/kernel/ip_set_hash_net.c
@@ -446,7 +446,7 @@ hash_net_create(struct ip_set *set, struct nlattr *head, int len, u32 flags)
                        ? &hash_net4_variant : &hash_net6_variant;
        }
 
-       pr_debug("create %s hashsize %u (%u) maxelem %u: %p(%p)",
+       pr_debug("create %s hashsize %u (%u) maxelem %u: %p(%p)\n",
                 set->name, jhash_size(h->table->htable_bits),
                 h->table->htable_bits, h->maxelem, set->data, h->table);
 

diff --git a/kernel/ip_set_hash_netport.c b/kernel/ip_set_hash_netport.c
index 39080f9a48747b88bf09c48bad882149615df212..636f3677bf2ed81c9f5244c7e27ea9367d004cb2 100644 (file)
--- a/kernel/ip_set_hash_netport.c
+++ b/kernel/ip_set_hash_netport.c
@@ -567,7 +567,7 @@ hash_netport_create(struct ip_set *set, struct nlattr *head, int len, u32 flags)
                        ? &hash_netport4_variant : &hash_netport6_variant;
        }
 
-       pr_debug("create %s hashsize %u (%u) maxelem %u: %p(%p)",
+       pr_debug("create %s hashsize %u (%u) maxelem %u: %p(%p)\n",
                 set->name, jhash_size(h->table->htable_bits),
                 h->table->htable_bits, h->maxelem, set->data, h->table);
 

diff --git a/kernel/xt_set.c b/kernel/xt_set.c
index d580c6cbc5066e6a7d94f64dee3601d4df09da20..cc132f7eacfdd80eebda4a849ecff7cea343bb48 100644 (file)
--- a/kernel/xt_set.c
+++ b/kernel/xt_set.c
@@ -108,12 +108,12 @@ set_match_v0_checkentry(const struct xt_mtchk_param *par)
        index = ip_set_nfnl_get_byindex(info->match_set.index);
 
        if (index == IPSET_INVALID_ID) {
-               pr_warning("Cannot find set indentified by id %u to match",
+               pr_warning("Cannot find set indentified by id %u to match\n",
                           info->match_set.index);
                return CHECK_FAIL;      /* error */
        }
        if (info->match_set.u.flags[IPSET_DIM_MAX-1] != 0) {
-               pr_warning("That's nasty!");
+               pr_warning("That's nasty!\n");
                return CHECK_FAIL;      /* error */
        }
 
@@ -167,7 +167,7 @@ set_target_v0_checkentry(const struct xt_tgchk_param *par)
        if (info->add_set.index != IPSET_INVALID_ID) {
                index = ip_set_nfnl_get_byindex(info->add_set.index);
                if (index == IPSET_INVALID_ID) {
-                       pr_warning("cannot find add_set index %u as target",
+                       pr_warning("cannot find add_set index %u as target\n",
                                   info->add_set.index);
                        return CHECK_FAIL;      /* error */
                }
@@ -176,14 +176,14 @@ set_target_v0_checkentry(const struct xt_tgchk_param *par)
        if (info->del_set.index != IPSET_INVALID_ID) {
                index = ip_set_nfnl_get_byindex(info->del_set.index);
                if (index == IPSET_INVALID_ID) {
-                       pr_warning("cannot find del_set index %u as target",
+                       pr_warning("cannot find del_set index %u as target\n",
                                   info->del_set.index);
                        return CHECK_FAIL;      /* error */
                }
        }
        if (info->add_set.u.flags[IPSET_DIM_MAX-1] != 0 ||
            info->del_set.u.flags[IPSET_DIM_MAX-1] != 0) {
-               pr_warning("That's nasty!");
+               pr_warning("That's nasty!\n");
                return CHECK_FAIL;      /* error */
        }
 
@@ -237,12 +237,12 @@ set_match_checkentry(const struct xt_mtchk_param *par)
        index = ip_set_nfnl_get_byindex(info->match_set.index);
 
        if (index == IPSET_INVALID_ID) {
-               pr_warning("Cannot find set indentified by id %u to match",
+               pr_warning("Cannot find set indentified by id %u to match\n",
                           info->match_set.index);
                return CHECK_FAIL;      /* error */
        }
        if (info->match_set.dim > IPSET_DIM_MAX) {
-               pr_warning("That's nasty!");
+               pr_warning("That's nasty!\n");
                return CHECK_FAIL;      /* error */
        }
 
@@ -295,7 +295,7 @@ set_target_checkentry(const struct xt_tgchk_param *par)
        if (info->add_set.index != IPSET_INVALID_ID) {
                index = ip_set_nfnl_get_byindex(info->add_set.index);
                if (index == IPSET_INVALID_ID) {
-                       pr_warning("cannot find add_set index %u as target",
+                       pr_warning("cannot find add_set index %u as target\n",
                                   info->add_set.index);
                        return CHECK_FAIL;      /* error */
                }
@@ -304,14 +304,14 @@ set_target_checkentry(const struct xt_tgchk_param *par)
        if (info->del_set.index != IPSET_INVALID_ID) {
                index = ip_set_nfnl_get_byindex(info->del_set.index);
                if (index == IPSET_INVALID_ID) {
-                       pr_warning("cannot find del_set index %u as target",
+                       pr_warning("cannot find del_set index %u as target\n",
                                   info->del_set.index);
                        return CHECK_FAIL;      /* error */
                }
        }
        if (info->add_set.dim > IPSET_DIM_MAX ||
            info->del_set.flags > IPSET_DIM_MAX) {
-               pr_warning("That's nasty!");
+               pr_warning("That's nasty!\n");
                return CHECK_FAIL;      /* error */
        }