--- linux-2.5.69-bk/net/ipv4/esp.c.orig	Sat May 24 16:14:29 2003
+++ linux-2.5.69-bk/net/ipv4/esp.c	Sat May 24 16:13:43 2003
@@ -567,7 +567,7 @@
 	.no_policy	=	1,
 };
 
-int __init esp4_init(void)
+static int __init esp4_init(void)
 {
 	struct xfrm_decap_state decap;
 
@@ -578,7 +578,6 @@
 		decap_data_too_small();
 	}
 
-	esp_type.owner = THIS_MODULE;
 	if (xfrm_register_type(&esp_type, AF_INET) < 0) {
 		printk(KERN_INFO "ip esp init: can't add xfrm type\n");
 		return -EAGAIN;
--- linux-2.5.69-bk/net/ipv4/ipcomp.c.orig	Sat May 24 16:15:04 2003
+++ linux-2.5.69-bk/net/ipv4/ipcomp.c	Sat May 24 16:13:43 2003
@@ -385,6 +385,7 @@
 static struct xfrm_type ipcomp_type =
 {
 	.description	= "IPCOMP4",
+	.owner		= THIS_MODULE,
 	.proto	     	= IPPROTO_COMP,
 	.init_state	= ipcomp_init_state,
 	.destructor	= ipcomp_destroy,
@@ -400,7 +401,6 @@
 
 static int __init ipcomp4_init(void)
 {
-	ipcomp_type.owner = THIS_MODULE;
 	if (xfrm_register_type(&ipcomp_type, AF_INET) < 0) {
 		printk(KERN_INFO "ipcomp init: can't add xfrm type\n");
 		return -EAGAIN;
--- linux-2.5.69-bk/net/ipv4/xfrm4_tunnel.c.orig	Sat May 24 16:15:34 2003
+++ linux-2.5.69-bk/net/ipv4/xfrm4_tunnel.c	Sat May 24 16:13:43 2003
@@ -215,6 +215,7 @@
 
 static struct xfrm_type ipip_type = {
 	.description	= "IPIP",
+	.owner		= THIS_MODULE,
 	.proto	     	= IPPROTO_IPIP,
 	.init_state	= ipip_init_state,
 	.destructor	= ipip_destroy,
@@ -229,7 +230,6 @@
 
 static int __init ipip_init(void)
 {
-	ipip_type.owner = THIS_MODULE;
 	if (xfrm_register_type(&ipip_type, AF_INET) < 0) {
 		printk(KERN_INFO "ipip init: can't add xfrm type\n");
 		return -EAGAIN;