[patch] Fix for u32 patchlet and kernel 2.6.21

[patch] Fix for u32 patchlet and kernel 2.6.21

[Thomas Jarosch]

[-- Attachment #1: Type: text/plain, Size: 108 bytes --]

Hello,

attached is a small patch to get the u32 patchlet
running again with kernel 2.6.21.

Cheers,
Thomas

[-- Attachment #2: pom-u32-fix-2.6.21.patch --]
[-- Type: text/x-diff, Size: 790 bytes --]

Signed-Off: Thomas Jarosch <thomas.jarosch@intra2net.com>

diff -u -p u32.old/ipt_u32.c u32/ipt_u32.c
--- u32.old/ipt_u32.c	Tue Aug  8 11:58:29 2006
+++ u32/ipt_u32.c	Thu Apr 26 13:41:54 2007
@@ -214,8 +214,9 @@ checkentry(const char *tablename,
 	return 1;
 }
 
-static struct ipt_match u32_match = { 
+static struct xt_match u32_match = { 
 	.name 		= "u32",
+	.family         = AF_INET,
 	.match		= &match,
 	.matchsize	= sizeof(struct ipt_u32),
 	.checkentry	= &checkentry,
@@ -224,12 +225,12 @@ static struct ipt_match u32_match = { 
 
 static int __init init(void)
 {
-	return ipt_register_match(&u32_match);
+	return xt_register_match(&u32_match);
 }
 
 static void __exit fini(void)
 {
-	ipt_unregister_match(&u32_match);
+	xt_unregister_match(&u32_match);
 }
 
 module_init(init);

Re: [patch] Fix for u32 patchlet and kernel 2.6.21

[Jan Engelhardt]

On Apr 26 2007 14:14, Thomas Jarosch wrote:
>
>attached is a small patch to get the u32 patchlet
>running again with kernel 2.6.21.

See http://lists.netfilter.org/pipermail/netfilter/2007-April/068389.html

Jan
-- 

Re: [patch] Fix for u32 patchlet and kernel 2.6.21

[Thomas Jarosch]

On Thursday, 26. April 2007, Jan Engelhardt wrote:
> On Apr 26 2007 14:14, Thomas Jarosch wrote:
> >attached is a small patch to get the u32 patchlet
> >running again with kernel 2.6.21.
>
> See http://lists.netfilter.org/pipermail/netfilter/2007-April/068389.html

Now I got it. You posted the patches to netfilter instead of netfilter-devel.
No wonder I have missed it on -devel :-)

Cheers,
Thomas

Re: [patch] Fix for u32 patchlet and kernel 2.6.21

[Patrick McHardy]

Thomas Jarosch wrote:
> On Thursday, 26. April 2007, Jan Engelhardt wrote:
> 
>>See http://lists.netfilter.org/pipermail/netfilter/2007-April/068389.html
> 
> 
> Now I got it. You posted the patches to netfilter instead of netfilter-devel.
> No wonder I have missed it on -devel :-)


Same here, I don't read netfilter, so in case anything of them is
relevant for netfilter SVN and you want me to apply them, please
resend to netfilter-devel.

Re: [patch] Fix for u32 patchlet and kernel 2.6.21

[Jan Engelhardt]

On Apr 26 2007 17:22, Patrick McHardy wrote:
>Thomas Jarosch wrote:
>> On Thursday, 26. April 2007, Jan Engelhardt wrote:
>> 
>>>See http://lists.netfilter.org/pipermail/netfilter/2007-April/068389.html
>> 
>> 
>> Now I got it. You posted the patches to netfilter instead of netfilter-devel.
>> No wonder I have missed it on -devel :-)
>
>
>Same here, I don't read netfilter, so in case anything of them is
>relevant for netfilter SVN and you want me to apply them, please
>resend to netfilter-devel.

Is #ifdef kludgery for different kernel versions 'allowed' in pom?


Jan
-- 

Re: [patch] Fix for u32 patchlet and kernel 2.6.21

[Patrick McHardy]

Jan Engelhardt wrote:
> On Apr 26 2007 17:22, Patrick McHardy wrote:
> 
>>Same here, I don't read netfilter, so in case anything of them is
>>relevant for netfilter SVN and you want me to apply them, please
>>resend to netfilter-devel.
> 
> 
> Is #ifdef kludgery for different kernel versions 'allowed' in pom?


No, we decided to keep only versions for the latest kernel around.
You could add a include file that hides the version magic though,
I guess other people would be happy to have something like that
too.

Re: [patch] Fix for u32 patchlet and kernel 2.6.21

[Patrick McHardy]

Thomas Jarosch wrote:
> Hello,
> 
> attached is a small patch to get the u32 patchlet
> running again with kernel 2.6.21.


Applied, thanks Thomas. But please make sure your patches apply
with -p1 in the patch-o-matic-ng directory for future patches.