diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-01 02:44:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-01 02:44:57 -0400 |
| commit | 5953a303471951a4c2f2127f0b4c74df7ceb7ac2 (patch) | |
| tree | 13b51217a6f538fe5c72821b1ee65d9bfea72842 /net/ipv4 | |
| parent | b1faf5666438090a4dc4fceac8502edc7788b7e3 (diff) | |
| parent | 7489aec8eed4f2f1eb3b4d35763bd3ea30b32ef5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/netfilter/ip_tables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 63958f3394a5..4b6c5ca610fc 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c | |||
| @@ -336,7 +336,7 @@ ipt_do_table(struct sk_buff *skb, | |||
| 336 | cpu = smp_processor_id(); | 336 | cpu = smp_processor_id(); |
| 337 | table_base = private->entries[cpu]; | 337 | table_base = private->entries[cpu]; |
| 338 | jumpstack = (struct ipt_entry **)private->jumpstack[cpu]; | 338 | jumpstack = (struct ipt_entry **)private->jumpstack[cpu]; |
| 339 | stackptr = &private->stackptr[cpu]; | 339 | stackptr = per_cpu_ptr(private->stackptr, cpu); |
| 340 | origptr = *stackptr; | 340 | origptr = *stackptr; |
| 341 | 341 | ||
| 342 | e = get_entry(table_base, private->hook_entry[hook]); | 342 | e = get_entry(table_base, private->hook_entry[hook]); |