netfilter: ipset: Collapse same condition body to a single one

The set full case (with net_ratelimit()-ed pr_warn()) is already
handled, simply jump there.

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>

diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
index c600f6d..1c9b84e 100644 (file)
--- a/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/net/netfilter/ipset/ip_set_hash_gen.h
@@ -719,14 +719,8 @@ mtype_add(struct ip_set *set, void *value, const struct ip_set_ext *ext,
        key = HKEY(value, h->initval, t->htable_bits);
        n = __ipset_dereference_protected(hbucket(t, key), 1);
        if (!n) {
-               if (forceadd) {
-                       if (net_ratelimit())
-                               pr_warn("Set %s is full, maxelem %u reached\n",
-                                       set->name, h->maxelem);
-                       return -IPSET_ERR_HASH_FULL;
-               } else if (set->elements >= h->maxelem) {
+               if (forceadd || set->elements >= h->maxelem)
                        goto set_full;
-               }
                old = NULL;
                n = kzalloc(sizeof(*n) + AHASH_INIT_SIZE * set->dsize,
                            GFP_ATOMIC);