diff options
Diffstat (limited to 'kernel/ip_set_hash_ipportnet.c')
| -rw-r--r-- | kernel/ip_set_hash_ipportnet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/ip_set_hash_ipportnet.c b/kernel/ip_set_hash_ipportnet.c index f356a88..f2c0d07 100644 --- a/kernel/ip_set_hash_ipportnet.c +++ b/kernel/ip_set_hash_ipportnet.c @@ -270,10 +270,10 @@ hash_ipportnet_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 && x->proto == y->proto - && x->htable_bits == y->htable_bits /* resizing ? */ && x->array_size == y->array_size && x->chain_limit == y->chain_limit; } @@ -567,7 +567,7 @@ hash_ipportnet_create(struct ip_set *set, struct nlattr *head, h->timeout = IPSET_NO_TIMEOUT; h->htable = ip_set_alloc(jhash_size(h->htable_bits) * sizeof(struct slist), - GFP_KERNEL, &set->flags); + GFP_KERNEL); if (!h->htable) { kfree(h); return -ENOMEM; |