Error during compile of 2.5.69-mm8

Well it seems you missed one file that my patch would have cought. So here is a seperate diff to fix drivers/usb/media/pwc-if.c, too.

I also attached a patch that fixes the SET_MODULE_OWNER thing for net/ipv4/ by using static initializers instead of performing the assignment at runtime. This should be no problem here, as SET_MODULE_OWNER was called from static init functions once. I also made 'esp4_init' static to be safe. This function is not called from anywhere else in the whole kernel tree. (That's whar grep says)

Both patches should cleanly apply to current bk. For me it compiles and runs without any problems...

Best regards
Thomas Schlichter

@@ -1804,7 +1804,7 @@
 	}
 	memcpy(vdev, &pwc_template, sizeof(pwc_template));
 	strcpy(vdev->name, name);
-	SET_MODULE_OWNER(vdev);
+	vdev->owner = THIS_MODULE;
 	pdev->vdev = vdev;
 	vdev->priv = pdev;
 

@@ -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;

@@ -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;

@@ -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;

From: Thomas Schlichter <[email protected]>
Date: Sat, 24 May 2003 16:36:59 +0200

I also attached a patch that fixes the SET_MODULE_OWNER thing for net/ipv4/ by using static initializers

I can't apply these patches, there are errors. You remove the esp4_type->owner setting, but don't put the static initializer in there.

I suppose you do test the changes you make in your patches, right? What was the test you made to make sure the esp4_type module ownership was set correctly? :-)

Am Montag, 26. Mai 2003 04:18 schrieb David S. Miller:

I created the patches against -mm8 with the SET_MODULE_OWNER lines modified by hand to match your patched version, so the patches apply here cleanly...

Well, I looked into the code...
In version 1.26 of the file net/ipv4/esp.c rusty already added the static initializer into the struct.

Best regards
Thomas Schlichter

From: Thomas Schlichter <[email protected]>
Date: Mon, 26 May 2003 08:35:53 +0200

In version 1.26 of the file net/ipv4/esp.c rusty already added the static initializer into the struct.

My error, sorry I hadn't noticed that.

Could you please resend the patches to me? I've misplaced the original copy.