diff options
author | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-01-21 11:39:56 +0100 |
---|---|---|
committer | Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> | 2011-01-21 11:39:56 +0100 |
commit | 133dacf17131daa138f22b7ac38f3b94de203681 (patch) | |
tree | 903032266b8555c25058c9c223e870a87480740f /kernel/ip_set_hash_ipportnet.c | |
parent | ed3c453a0787ddc10c5ce6010bd6ac663c740b68 (diff) |
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.
Diffstat (limited to 'kernel/ip_set_hash_ipportnet.c')
-rw-r--r-- | kernel/ip_set_hash_ipportnet.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kernel/ip_set_hash_ipportnet.c b/kernel/ip_set_hash_ipportnet.c index d4ec935..379dd00 100644 --- 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; } |