aboutsummaryrefslogtreecommitdiff
path: root/net/ipv6
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-05-31 23:44:57 -0700
committerDavid S. Miller <davem@davemloft.net>2010-05-31 23:44:57 -0700
commit5953a303471951a4c2f2127f0b4c74df7ceb7ac2 (patch)
tree13b51217a6f538fe5c72821b1ee65d9bfea72842 /net/ipv6
parentb1faf5666438090a4dc4fceac8502edc7788b7e3 (diff)
parent7489aec8eed4f2f1eb3b4d35763bd3ea30b32ef5 (diff)
downloadlinux-2.6.34-ux500-5953a303471951a4c2f2127f0b4c74df7ceb7ac2.tar.gz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index 6f517bd8369..9d2d68f0e60 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]);