Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[karo-tx-linux.git] / net / netfilter / ipset / ip_set_core.c

diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 117208321f16997af9f24bee1f86519f8f8fa26e..5edbbe829495f771087946dab1893e112c213e2f 100644 (file)
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -271,10 +271,7 @@ ip_set_free(void *members)
 {
        pr_debug("%p: free with %s\n", members,
                 is_vmalloc_addr(members) ? "vfree" : "kfree");
-       if (is_vmalloc_addr(members))
-               vfree(members);
-       else
-               kfree(members);
+       kvfree(members);
 }
 EXPORT_SYMBOL_GPL(ip_set_free);
 
@@ -481,7 +478,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\n");
+               pr_debug("element must be completed, ADD is triggered\n");
                write_lock_bh(&set->lock);
                set->variant->kadt(set, skb, par, IPSET_ADD, opt);
                write_unlock_bh(&set->lock);