diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2006-12-06 19:50:06 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-06 14:51:14 -0800 |
| commit | 91c7c56855855d63c46c854c38576135be31a4c9 (patch) | |
| tree | 0b3d399d8b41f4461c9d81920dd78b85c81228c8 /drivers/net/mv643xx_eth.c | |
| parent | 4927b3f74c6a2fd92226dcf1542a598be9738808 (diff) | |
| download | kernel_goldelico_gta04-91c7c56855855d63c46c854c38576135be31a4c9.zip kernel_goldelico_gta04-91c7c56855855d63c46c854c38576135be31a4c9.tar.gz kernel_goldelico_gta04-91c7c56855855d63c46c854c38576135be31a4c9.tar.bz2 | |
[PATCH] ... and more work_struct-induced breakage (mips)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
| -rw-r--r-- | drivers/net/mv643xx_eth.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 9997081..d9f48bb 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c @@ -277,9 +277,11 @@ static void mv643xx_eth_tx_timeout(struct net_device *dev) * * Actual routine to reset the adapter when a timeout on Tx has occurred */ -static void mv643xx_eth_tx_timeout_task(struct net_device *dev) +static void mv643xx_eth_tx_timeout_task(struct work_struct *ugly) { - struct mv643xx_private *mp = netdev_priv(dev); + struct mv643xx_private *mp = container_of(ugly, struct mv643xx_private, + tx_timeout_task); + struct net_device *dev = mp->mii.dev; /* yuck */ if (!netif_running(dev)) return; @@ -1360,8 +1362,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev) #endif /* Configure the timeout task */ - INIT_WORK(&mp->tx_timeout_task, - (void (*)(void *))mv643xx_eth_tx_timeout_task, dev); + INIT_WORK(&mp->tx_timeout_task, mv643xx_eth_tx_timeout_task); spin_lock_init(&mp->lock); |