Re: nf_conntrack_proto_udplite

[Patrick McHardy <kaber@trash.net>]

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

Steven Jan Springl wrote:
> Hello
> 
> Whilst testing kernel 2.6.30-rc3 I have noticed that when I issue command: 
> 
> modprobe nf_conntrack_proto_udplite
> 
> the following message is produced:
> 
> FATAL: Error inserting nf_conntrack_proto_udplite 
> (/lib/modules/2.6.30-rc3/kernel/net/netfilter/nf_conntrack_proto_udplite.ko): 
> Invalid argument
> 
> Is this a kernel bug or have I done something wrong?

Thanks for the report, it seems the IPv6 udplite protocol was
forgotten during a recent API change.

Does this patch help?


[-- Attachment #2: x --]
[-- Type: text/plain, Size: 632 bytes --]

diff --git a/net/netfilter/nf_conntrack_proto_udplite.c b/net/netfilter/nf_conntrack_proto_udplite.c
index 4614696..0badedc 100644
--- a/net/netfilter/nf_conntrack_proto_udplite.c
+++ b/net/netfilter/nf_conntrack_proto_udplite.c
@@ -204,6 +204,7 @@ static struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6 __read_mostly =
 	.error			= udplite_error,
 #if defined(CONFIG_NF_CT_NETLINK) || defined(CONFIG_NF_CT_NETLINK_MODULE)
 	.tuple_to_nlattr	= nf_ct_port_tuple_to_nlattr,
+	.nlattr_tuple_size	= nf_ct_port_nlattr_tuple_size,
 	.nlattr_to_tuple	= nf_ct_port_nlattr_to_tuple,
 	.nla_policy		= nf_ct_port_nla_policy,
 #endif