summaryrefslogtreecommitdiffstats
path: root/kernel/ip_set_hash_net.c
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2010-12-07 17:01:55 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2010-12-07 17:01:55 +0100
commit9d317732eeeed959b3d0fa2f7997f059d74ad75b (patch)
tree55aa9bd858b6b77a496de7c2123b8c5608eadf90 /kernel/ip_set_hash_net.c
parent6e42ee58c2710f9cbe36655e3c3093af5b7c87c5 (diff)
Whitespace, checkpatch.pl cleanups.
Diffstat (limited to 'kernel/ip_set_hash_net.c')
-rw-r--r--kernel/ip_set_hash_net.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/kernel/ip_set_hash_net.c b/kernel/ip_set_hash_net.c
index 4cb57ac..94c4118 100644
--- a/kernel/ip_set_hash_net.c
+++ b/kernel/ip_set_hash_net.c
@@ -13,8 +13,8 @@
#include <linux/ip.h>
#include <linux/skbuff.h>
#include <linux/errno.h>
-#include <asm/uaccess.h>
-#include <asm/bitops.h>
+#include <linux/uaccess.h>
+#include <linux/bitops.h>
#include <linux/spinlock.h>
#include <linux/random.h>
#include <net/ip.h>
@@ -144,7 +144,7 @@ hash_net4_kadt(struct ip_set *set, const struct sk_buff *skb,
struct chash *h = set->data;
ipset_adtfn adtfn = set->variant->adt[adt];
struct hash_net4_elem data = { .cidr = h->nets[0].cidr || HOST_MASK };
-
+
if (data.cidr == 0)
return -EINVAL;
if (adt == IPSET_TEST)
@@ -209,7 +209,7 @@ hash_net_same_set(const struct ip_set *a, const struct ip_set *b)
{
struct chash *x = a->data;
struct chash *y = b->data;
-
+
/* Resizing changes htable_bits, so we ignore it */
return x->maxelem == y->maxelem
&& x->timeout == y->timeout
@@ -302,9 +302,9 @@ nla_put_failure:
static inline bool
hash_net6_data_tlist(struct sk_buff *skb, const struct hash_net6_elem *data)
{
- const struct hash_net6_telem *e =
+ const struct hash_net6_telem *e =
(const struct hash_net6_telem *)data;
-
+
NLA_PUT_IPADDR6(skb, IPSET_ATTR_IP, &e->ip);
NLA_PUT_U8(skb, IPSET_ATTR_CIDR, e->cidr);
NLA_PUT_NET32(skb, IPSET_ATTR_TIMEOUT,
@@ -378,7 +378,7 @@ hash_net6_uadt(struct ip_set *set, struct nlattr *head, int len,
}
ret = adtfn(set, &data, GFP_ATOMIC, timeout);
-
+
return ip_set_eexist(ret, flags) ? 0 : ret;
}
@@ -444,7 +444,7 @@ hash_net_create(struct ip_set *set, struct nlattr *head, int len, u32 flags)
if (tb[IPSET_ATTR_TIMEOUT]) {
h->timeout = ip_set_timeout_uget(tb[IPSET_ATTR_TIMEOUT]);
-
+
set->variant = set->family == AF_INET
? &hash_net4_tvariant : &hash_net6_tvariant;
@@ -456,11 +456,11 @@ hash_net_create(struct ip_set *set, struct nlattr *head, int len, u32 flags)
set->variant = set->family == AF_INET
? &hash_net4_variant : &hash_net6_variant;
}
-
+
pr_debug("create %s hashsize %u (%u) maxelem %u: %p(%p)",
set->name, jhash_size(h->table->htable_bits),
h->table->htable_bits, h->maxelem, set->data, h->table);
-
+
return 0;
}