[PATCH] 6pack reinit bug

[PATCH] 6pack reinit bug

[Jeroen Vreeken]

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

Hi,

This patch is the same as to mkiss a while ago, the current code triggers a
bug when reattaching a network device.

Please apply.

Thanks,
Jeroen

[-- Attachment #2: hamradio.2.6.1.rxq3.diff --]
[-- Type: application/octet-stream, Size: 1115 bytes --]

--- linux-2.6.1-rxq2/drivers/net/hamradio/6pack.c	2004-01-21 20:47:09.000000000 +0100
+++ linux-2.6.1-rxq3/drivers/net/hamradio/6pack.c	2004-02-06 19:32:46.000000000 +0100
@@ -178,17 +178,17 @@
 	    (sixpack_ctrls[i] = (sixpack_ctrl_t *)kmalloc(sizeof(sixpack_ctrl_t),
 						    GFP_KERNEL)) != NULL) {
 		spp = sixpack_ctrls[i];
-		memset(spp, 0, sizeof(sixpack_ctrl_t));
-
-		/* Initialize channel control data */
-		set_bit(SIXPF_INUSE, &spp->ctrl.flags);
-		spp->ctrl.tty         = NULL;
-		sprintf(spp->dev.name, "sp%d", i);
-		spp->dev.base_addr    = i;
-		spp->dev.priv         = (void *) &spp->ctrl;
-		spp->dev.next         = NULL;
-		spp->dev.init         = sixpack_init;
 	}
+	memset(spp, 0, sizeof(sixpack_ctrl_t));
+
+	/* Initialize channel control data */
+	set_bit(SIXPF_INUSE, &spp->ctrl.flags);
+	spp->ctrl.tty         = NULL;
+	sprintf(spp->dev.name, "sp%d", i);
+	spp->dev.base_addr    = i;
+	spp->dev.priv         = (void *) &spp->ctrl;
+	spp->dev.next         = NULL;
+	spp->dev.init         = sixpack_init;
 
 	if (spp != NULL) {
 		/* register device so that it can be ifconfig'ed       */

Re: [PATCH] 6pack reinit bug

[Jeff Garzik]

applied to 2.6