aboutsummaryrefslogtreecommitdiff
path: root/net/bridge/netfilter/ebtables.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-14 20:48:55 -0400
committerJeff Garzik <jeff@garzik.org>2006-04-14 20:48:55 -0400
commit2acab771b7e676125cb8c96b61dcdefe9ba67e57 (patch)
tree86227af3c9ad0d90823e5488a86f7f453ed1837a /net/bridge/netfilter/ebtables.c
parent201e06279823c73242de987f192f43d2b30e5331 (diff)
parent64541d19702cfdb7ea946fdc20faee849f6874b1 (diff)
Merge branch 'master'
Diffstat (limited to 'net/bridge/netfilter/ebtables.c')
-rw-r--r--net/bridge/netfilter/ebtables.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 66bd93252c4..84b9af76f0a 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -824,9 +824,9 @@ static int translate_table(struct ebt_replace *repl,
if (udc_cnt) {
/* this will get free'd in do_replace()/ebt_register_table()
if an error occurs */
- newinfo->chainstack = (struct ebt_chainstack **)
- vmalloc((highest_possible_processor_id()+1)
- * sizeof(struct ebt_chainstack));
+ newinfo->chainstack =
+ vmalloc((highest_possible_processor_id()+1)
+ * sizeof(*(newinfo->chainstack)));
if (!newinfo->chainstack)
return -ENOMEM;
for_each_possible_cpu(i) {