aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/ipset
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2014-06-02 15:55:22 -0700
committerDavid S. Miller <davem@davemloft.net>2014-06-05 00:49:51 -0700
commit4cb28970a23ff209199b0a4358d68efe82c8f493 (patch)
tree6fddc9391d7803318fb0903ffd101dc7837f5a30 /net/netfilter/ipset
parentdns_resolver: Do not accept domain names longer than 255 chars (diff)
downloadlinux-dev-4cb28970a23ff209199b0a4358d68efe82c8f493.tar.xz
linux-dev-4cb28970a23ff209199b0a4358d68efe82c8f493.zip
net: use the new API kvfree()
It is available since v3.15-rc5. Cc: Pablo Neira Ayuso <pablo@netfilter.org> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/ipset')
-rw-r--r--net/netfilter/ipset/ip_set_core.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index 117208321f16..ec8114fae50b 100644
--- 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);