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 /include | |
| 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 'include')
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index c00cc0c4d0b7..24e5d01d27d0 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h | |||
| @@ -397,7 +397,7 @@ struct xt_table_info { | |||
| 397 | * @stacksize jumps (number of user chains) can possibly be made. | 397 | * @stacksize jumps (number of user chains) can possibly be made. |
| 398 | */ | 398 | */ |
| 399 | unsigned int stacksize; | 399 | unsigned int stacksize; |
| 400 | unsigned int *stackptr; | 400 | unsigned int __percpu *stackptr; |
| 401 | void ***jumpstack; | 401 | void ***jumpstack; |
| 402 | /* ipt_entry tables: one per CPU */ | 402 | /* ipt_entry tables: one per CPU */ |
| 403 | /* Note : this field MUST be the last one, see XT_TABLE_INFO_SZ */ | 403 | /* Note : this field MUST be the last one, see XT_TABLE_INFO_SZ */ |