diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-06-04 13:31:29 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-06-04 13:31:29 +0200 |
| commit | e12f8e29a8526172b7715881503bae636d60bdd8 (patch) | |
| tree | 07a32ce30bf0c8903b9b0941c212939ec04f9c44 /net/ipv6/netfilter | |
| parent | fabf3a85ab88063c10f367cccba7b3a1e59df996 (diff) | |
| download | linux-stable-e12f8e29a8526172b7715881503bae636d60bdd8.tar.gz linux-stable-e12f8e29a8526172b7715881503bae636d60bdd8.tar.bz2 linux-stable-e12f8e29a8526172b7715881503bae636d60bdd8.zip | |
netfilter: vmalloc_node cleanup
Using vmalloc_node(size, numa_node_id()) for temporary storage is not
needed. vmalloc(size) is more respectful of user NUMA policy.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'net/ipv6/netfilter')
| -rw-r--r-- | net/ipv6/netfilter/ip6_tables.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 6f517bd83692..82945ef6c9fc 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c @@ -943,7 +943,7 @@ static struct xt_counters *alloc_counters(const struct xt_table *table) (other than comefrom, which userspace doesn't care about). */ countersize = sizeof(struct xt_counters) * private->number; - counters = vmalloc_node(countersize, numa_node_id()); + counters = vmalloc(countersize); if (counters == NULL) return ERR_PTR(-ENOMEM); @@ -1213,8 +1213,7 @@ __do_replace(struct net *net, const char *name, unsigned int valid_hooks, struct ip6t_entry *iter; ret = 0; - counters = vmalloc_node(num_counters * sizeof(struct xt_counters), - numa_node_id()); + counters = vmalloc(num_counters * sizeof(struct xt_counters)); if (!counters) { ret = -ENOMEM; goto out; @@ -1368,7 +1367,7 @@ do_add_counters(struct net *net, const void __user *user, unsigned int len, if (len != size + num_counters * sizeof(struct xt_counters)) return -EINVAL; - paddc = vmalloc_node(len - size, numa_node_id()); + paddc = vmalloc(len - size); if (!paddc) return -ENOMEM; |