diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-01 08:44:57 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-01 08:44:57 +0200 |
| commit | 5953a303471951a4c2f2127f0b4c74df7ceb7ac2 (patch) | |
| tree | 13b51217a6f538fe5c72821b1ee65d9bfea72842 /net/ipv6 | |
| parent | net: sock_queue_err_skb() dont mess with sk_forward_alloc (diff) | |
| parent | netfilter: xtables: stackptr should be percpu (diff) | |
| download | linux-5953a303471951a4c2f2127f0b4c74df7ceb7ac2.tar.xz linux-5953a303471951a4c2f2127f0b4c74df7ceb7ac2.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/netfilter/ip6_tables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 6f517bd83692..9d2d68f0e605 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c @@ -363,7 +363,7 @@ ip6t_do_table(struct sk_buff *skb, cpu = smp_processor_id(); table_base = private->entries[cpu]; jumpstack = (struct ip6t_entry **)private->jumpstack[cpu]; - stackptr = &private->stackptr[cpu]; + stackptr = per_cpu_ptr(private->stackptr, cpu); origptr = *stackptr; e = get_entry(table_base, private->hook_entry[hook]); |