From 2b0e65049cfe401009ff95432a121eba358427f6 Mon Sep 17 00:00:00 2001 From: Thomas Jarosch Date: Fri, 20 May 2005 12:16:19 +0000 Subject: [PATCH] ipt_ACCOUNT: (tomj) compile fixes from netfilter devel --- linux/net/ipv4/netfilter/ipt_ACCOUNT.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c index aeb20a1..a6c522c 100644 --- a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c +++ b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c @@ -414,9 +414,9 @@ static void ipt_acc_depth2_insert(struct ipt_acc_mask_8 *mask_8, } static unsigned int ipt_acc_target(struct sk_buff **pskb, - unsigned int hooknum, const struct net_device *in, const struct net_device *out, + unsigned int hooknum, const void *targinfo, void *userinfo) { @@ -592,7 +592,8 @@ static int ipt_acc_handle_prepare_read(char *tablename, (struct ipt_acc_mask_8 *)ipt_acc_tables[table_nr].data; struct ipt_acc_mask_8 *network_8 = (struct ipt_acc_mask_8 *)dest->data; - u_int32_t a; + struct ipt_acc_mask_16 *src_16, *network_16; + u_int32_t a, b; for (a = 0; a <= 255; a++) { if (src_8->mask_16[a]) { @@ -607,9 +608,8 @@ static int ipt_acc_handle_prepare_read(char *tablename, memcpy(network_8->mask_16[a], src_8->mask_16[a], sizeof(struct ipt_acc_mask_16)); - struct ipt_acc_mask_16 *src_16 = src_8->mask_16[a]; - struct ipt_acc_mask_16 *network_16 = network_8->mask_16[a]; - u_int32_t b; + src_16 = src_8->mask_16[a]; + network_16 = network_8->mask_16[a]; for (b = 0; b <= 255; b++) { if (src_16->mask_24[b]) { -- 1.7.1