2002-01-24 10:09:47

by Adam J. Richter

Subject: Patch: linux-2.5.3-pre4/net/ipv4/netfilter/ipfwadm_core.c typo fixes to make it compile

linux-2.5.3-pre4/net/ipv4/netfilter/ipfwadm_core.c incorrectly
contained parentheses after uses of the MOD_{INC,DEC}_USE_COUNT macros.
This causes it to fail to compile. It is not clear to me who
the maintainer of this file is. So, I apologize for not including
that person directly in this email.

Here is the patch.

Adam J. Richter __ ______________ 4880 Stevens Creek Blvd, Suite 104
[email protected] \ / San Jose, California 95129-1034
+1 408 261-6630 | g g d r a s i l United States of America
fax +1 408 261-6631 "Free Software For The Rest Of Us."

--- linux-2.5.3-pre4/net/ipv4/netfilter/ipfwadm_core.c Thu Jan 24 01:38:47 2002
+++ linux/net/ipv4/netfilter/ipfwadm_core.c Thu Jan 24 01:27:58 2002
@@ -688,7 +688,7 @@
ftmp = *chainptr;
*chainptr = ftmp->fw_next;
kfree(ftmp);
- MOD_DEC_USE_COUNT();
+ MOD_DEC_USE_COUNT;
}
restore_flags(flags);
}
@@ -732,7 +732,7 @@
ftmp->fw_next = *chainptr;
*chainptr=ftmp;
restore_flags(flags);
- MOD_INC_USE_COUNT();
+ MOD_INC_USE_COUNT;
return(0);
}

@@ -783,7 +783,7 @@
else
*chainptr=ftmp;
restore_flags(flags);
- MOD_INC_USE_COUNT();
+ MOD_INC_USE_COUNT;
return(0);
}

@@ -858,7 +858,7 @@
}
restore_flags(flags);
if (was_found) {
- MOD_DEC_USE_COUNT();
+ MOD_DEC_USE_COUNT;
return 0;
} else
return(EINVAL);

2002-01-24 13:31:20

by Harald Welte

Subject: Re: Patch: linux-2.5.3-pre4/net/ipv4/netfilter/ipfwadm_core.c typo fixes to make it compile

On Thu, Jan 24, 2002 at 02:09:22AM -0800, Adam J. Richter wrote:
> linux-2.5.3-pre4/net/ipv4/netfilter/ipfwadm_core.c incorrectly
> contained parentheses after uses of the MOD_{INC,DEC}_USE_COUNT macros.
> This causes it to fail to compile.

*sigh*. I feel really stupid.

This change was introduced by a patch from Rusty Russell.

> It is not clear to me who the maintainer of this file is. So, I apologize
> for not including that person directly in this email.

The maintainer am now I, and I feel guilty for passing this on without even
trying to compile it. Sorry.

> Here is the patch.

Thanks.

Linus, DaveM, Marcelo: Please apply to 2.4.x and 2.5.x ASAP. Thanks.

>
> Adam J. Richter __ ______________ 4880 Stevens Creek Blvd, Suite 104

--- linux-2.5.3-pre4/net/ipv4/netfilter/ipfwadm_core.c Thu Jan 24 01:38:47 2002
+++ linux/net/ipv4/netfilter/ipfwadm_core.c Thu Jan 24 01:27:58 2002
@@ -688,7 +688,7 @@
ftmp = *chainptr;
*chainptr = ftmp->fw_next;
kfree(ftmp);
- MOD_DEC_USE_COUNT();
+ MOD_DEC_USE_COUNT;
}
restore_flags(flags);
}
@@ -732,7 +732,7 @@
ftmp->fw_next = *chainptr;
*chainptr=ftmp;
restore_flags(flags);
- MOD_INC_USE_COUNT();
+ MOD_INC_USE_COUNT;
return(0);
}

@@ -783,7 +783,7 @@
else
*chainptr=ftmp;
restore_flags(flags);
- MOD_INC_USE_COUNT();
+ MOD_INC_USE_COUNT;
return(0);
}

@@ -858,7 +858,7 @@
}
restore_flags(flags);
if (was_found) {
- MOD_DEC_USE_COUNT();
+ MOD_DEC_USE_COUNT;
return 0;
} else
return(EINVAL);
-
--
Live long and prosper
- Harald Welte / [email protected] http://www.gnumonks.org/
============================================================================
GCS/E/IT d- s-: a-- C+++ UL++++$ P+++ L++++$ E--- W- N++ o? K- w--- O- M-
V-- PS+ PE-- Y+ PGP++ t++ 5-- !X !R tv-- b+++ DI? !D G+ e* h+ r% y+(*)