[PATCH] compile fix ipfw

[PATCH] compile fix ipfw

[Rik van Riel]

In the patch that went to marcelo a few days ago the reset
argument to ip_chain_procinfo() got removed, but there's still
a code block inside the function that references that variable.

This patch gets rid of that (presumably old) code block. Note
that I didn't cc this to Marcelo because I'm not 100% sure, so
please check it.

--- linux-2.4.20/net/ipv4/netfilter/ipfwadm_core.c.compile	2003-04-16 21:04:30.000000000 -0400
+++ linux-2.4.20/net/ipv4/netfilter/ipfwadm_core.c	2003-04-16 21:05:24.000000000 -0400
@@ -1176,12 +1176,6 @@ static int ip_chain_procinfo(int stage, 
 			len = last_len;
 			break;
 		}
-		else if(reset)
-		{
-			/* This needs to be done at this specific place! */
-			i->fw_pcnt=0L;
-			i->fw_bcnt=0L;
-		}
 		last_len = len;
 		i=i->fw_next;
 	}

Re: [PATCH] compile fix ipfw

[David S. Miller]

   From: Rik van Riel <riel@surriel.com>
   Date: Wed, 16 Apr 2003 21:11:31 -0400 (EDT)
   
   This patch gets rid of that (presumably old) code block. Note
   that I didn't cc this to Marcelo because I'm not 100% sure, so
   please check it.

Thanks, I got this fix independantly already.  It is correct.

Re: [netfilter-core] [PATCH] compile fix ipfw

[Rusty Russell]

In message <Pine.LNX.4.44.0304162109530.12650-100000@chimarrao.boston.redhat.co
m> you write:
> 
> In the patch that went to marcelo a few days ago the reset
> argument to ip_chain_procinfo() got removed, but there's still
> a code block inside the function that references that variable.
> 
> This patch gets rid of that (presumably old) code block. Note
> that I didn't cc this to Marcelo because I'm not 100% sure, so
> please check it.

This looks fine to me: there used to be magic in 2.0 which meant when
you opened the proc file for writing as well as reading, it'd reset
the counters.

These days, the infrastructure doesn't support such a hack.

Please fwd to Marcelo.

Thanks!
Rusty.

> @@ -1176,12 +1176,6 @@ static int ip_chain_procinfo(int stage, 
>  			len = last_len;
>  			break;
>  		}
> -		else if(reset)
> -		{
> -			/* This needs to be done at this specific place! */
> -			i->fw_pcnt=0L;
> -			i->fw_bcnt=0L;
> -		}
>  		last_len = len;
>  		i=i->fw_next;
>  	}
> 

--
  Anyone who quotes me in their sig is an idiot. -- Rusty Russell.

Re: [netfilter-core] [PATCH] compile fix ipfw

[David S. Miller]

   From: Rusty Russell <rusty@rustcorp.com.au>
   Date: Thu, 17 Apr 2003 15:16:58 +1000
   
   Please fwd to Marcelo.

Done.