[TG3] Initialise reset_task properly

[TG3] Initialise reset_task properly

[Herbert Xu]

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

Hi Jeff:

I've received a queue_work crash report due to reset_task in tg3 not being
initialised correctly.  This patch should fix it.

Cheers,
-- 
Debian GNU/Linux 3.0 is out! ( http://www.debian.org/ )
Email:  Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

[-- Attachment #2: p --]
[-- Type: text/plain, Size: 708 bytes --]

Index: kernel-source-2.5/drivers/net/tg3.c
===================================================================
RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.5/drivers/net/tg3.c,v
retrieving revision 1.1.1.14
diff -u -r1.1.1.14 tg3.c
--- kernel-source-2.5/drivers/net/tg3.c	26 Oct 2003 02:10:30 -0000	1.1.1.14
+++ kernel-source-2.5/drivers/net/tg3.c	12 Nov 2003 10:45:36 -0000
@@ -7601,7 +7601,7 @@
 	spin_lock_init(&tp->lock);
 	spin_lock_init(&tp->tx_lock);
 	spin_lock_init(&tp->indirect_lock);
-	PREPARE_WORK(&tp->reset_task, tg3_reset_task, tp);
+	INIT_WORK(&tp->reset_task, tg3_reset_task, tp);
 
 	tp->regs = (unsigned long) ioremap(tg3reg_base, tg3reg_len);
 	if (tp->regs == 0UL) {

Re: [TG3] Initialise reset_task properly

[Herbert Xu]

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

On Wed, Nov 12, 2003 at 09:48:33PM +1100, herbert wrote:
> 
> I've received a queue_work crash report due to reset_task in tg3 not being
> initialised correctly.  This patch should fix it.

And here is the 2.4 version.
-- 
Debian GNU/Linux 3.0 is out! ( http://www.debian.org/ )
Email:  Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

[-- Attachment #2: q --]
[-- Type: text/plain, Size: 709 bytes --]

Index: kernel-source-2.4/drivers/net/tg3.c
===================================================================
RCS file: /home/gondolin/herbert/src/CVS/debian/kernel-source-2.4/drivers/net/tg3.c,v
retrieving revision 1.1.1.4
diff -u -r1.1.1.4 tg3.c
--- kernel-source-2.4/drivers/net/tg3.c	30 Aug 2003 06:01:39 -0000	1.1.1.4
+++ kernel-source-2.4/drivers/net/tg3.c	12 Nov 2003 10:46:11 -0000
@@ -6714,7 +6714,7 @@
 	spin_lock_init(&tp->lock);
 	spin_lock_init(&tp->tx_lock);
 	spin_lock_init(&tp->indirect_lock);
-	PREPARE_TQUEUE(&tp->reset_task, tg3_reset_task, tp);
+	INIT_TQUEUE(&tp->reset_task, tg3_reset_task, tp);
 
 	tp->regs = (unsigned long) ioremap(tg3reg_base, tg3reg_len);
 	if (tp->regs == 0UL) {

Re: [TG3] Initialise reset_task properly

[Jeff Garzik]

Herbert Xu wrote:
> Hi Jeff:
> 
> I've received a queue_work crash report due to reset_task in tg3 not being
> initialised correctly.  This patch should fix it.


Thanks, I'll send this to Linus/Marcelo today...

	Jeff

Re: [TG3] Initialise reset_task properly

[Jeff Garzik]

applied to 2.4 and 2.6