Skip to contentSkip to conversation

patch-o-matic-ng snap 20060329 some fix

PATCH In review Wojciech \"Sas\" Cięciwa 2 participants 3 messages Mar 29, 2006 netfilter

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 patch-o-matic-ng snap 20060329 some fix

I try to add this snap to kernel 2.6.16.1, and got 3 error in module:
fuzzy, nth and random.

In attachment ane patches, pleas check and applay if this is correct.

Thanx.
Wojtek.
--
{Wojciech 'Sas' Cieciwa} {Member of PLD Team}
{ e-mail: [email protected] }

patchlets/random/linux-2.6/net/ipv6/netfilter/ip6t_random.c renamed from patchlets/random.org/linux-2.6/net/ipv6/netfilter/ip6t_random.c +4 -6
diff -Nur patch-o-matic-ng/patchlets/random.org/linux-2.6/net/ipv6/netfilter/ip6t_random.c patch-o-matic-ng/patchlets/random/linux-2.6/net/ipv6/netfilter/ip6t_random.c
@@ -70,12 +70,10 @@
 }
 
 static struct ip6t_match ip6t_rand_reg = { 
-	{NULL, NULL},
-	"random",
-	ip6t_rand_match,
-	ip6t_rand_checkentry,
-	NULL,
-	THIS_MODULE };
+	.name 		= "random",
+	.match		= ip6t_rand_match,
+	.checkentry	= ip6t_rand_checkentry,
+	.me		= THIS_MODULE };
 
 static int __init init(void)
 {
patchlets/fuzzy/linux-2.6.10/net/ipv6/netfilter/ip6t_fuzzy.c renamed from patchlets/fuzzy.org/linux-2.6.10/net/ipv6/netfilter/ip6t_fuzzy.c +4 -6
diff -Nur patch-o-matic-ng/patchlets/fuzzy.org/linux-2.6.10/net/ipv6/netfilter/ip6t_fuzzy.c patch-o-matic-ng/patchlets/fuzzy/linux-2.6.10/net/ipv6/netfilter/ip6t_fuzzy.c
@@ -164,12 +164,10 @@
 }
 
 static struct ip6t_match ip6t_fuzzy_reg = {
-	{NULL, NULL},
-	"fuzzy",
-	ip6t_fuzzy_match,
-	ip6t_fuzzy_checkentry,
-	NULL,
-	THIS_MODULE };
+	.name		= "fuzzy",
+	.match		= ip6t_fuzzy_match,
+	.checkentry	= ip6t_fuzzy_checkentry,
+	.me		= THIS_MODULE };
 
 static int __init init(void)
 {
patchlets/nth/linux-2.6.10/net/ipv6/netfilter/ip6t_nth.c renamed from patchlets/nth.org/linux-2.6.10/net/ipv6/netfilter/ip6t_nth.c +4 -6
diff -Nur patch-o-matic-ng/patchlets/nth.org/linux-2.6.10/net/ipv6/netfilter/ip6t_nth.c patch-o-matic-ng/patchlets/nth/linux-2.6.10/net/ipv6/netfilter/ip6t_nth.c
@@ -140,12 +140,10 @@
 }
 
 static struct ip6t_match ip6t_nth_reg = { 
-	{NULL, NULL},
-	"nth",
-	ip6t_nth_match,
-	ip6t_nth_checkentry,
-	NULL,
-	THIS_MODULE };
+	.name		= "nth",
+	.match		= ip6t_nth_match,
+	.checkentry	= ip6t_nth_checkentry,
+	.me		= THIS_MODULE };
 
 static int __init init(void)
 {
#1 lore raw
Quoted 4 lines · Wojciech \"Sas\" Cięciwa

I try to add this snap to kernel 2.6.16.1, and got 3 error in module:
fuzzy, nth and random.

In attachment ane patches, pleas check and applay if this is correct.

The fuzzy extension does not work:
unable to find ladd slot in src /tmp/pom-1272/net/ipv6/netfilter/Makefile (./patchlets/fuzzy/linux-2.6.10/./net/ipv6/netfilter/Makefile.ladd)

The problem is that the ip6t_mac.o is no longer in in net/ipv6/netfilter/Makefile as it was converted to the x_tables.

It would be grate if you also fix the warnings:
CC net/ipv4/netfilter/ipt_nth.o
net/ipv4/netfilter/ipt_nth.c:144: warning: initialization from incompatible pointer type net/ipv4/netfilter/ipt_nth.c:145: warning: initialization from incompatible pointer type

CC net/ipv6/netfilter/ip6t_nth.o
net/ipv6/netfilter/ip6t_nth.c:145: warning: initialization from incompatible pointer type

CC net/ipv6/netfilter/ip6t_random.o
net/ipv6/netfilter/ip6t_random.c:75: warning: initialization from incompatible pointer type

Finally you may also consider cleaning patched extensions from files for old 2.6 kernels and keep only patchlets/*/linux-2.6 directories.

Best regards,

Krzysztof Olędzki

#2 lore raw
Quoted 6 lines · Krzysztof Oledzki
Quoted 2 lines · Wojciech \"Sas\" Cięciwa

I try to add this snap to kernel 2.6.16.1, and got 3 error in module:
fuzzy, nth and random.

Ah, one more comment - current svn version of pom-ng already have the nth and random compilation problem fixed, but mentioned warnings are still there. ;)

Best regards,

Krzysztof Olędzki