mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
[PATCH] ... and more work_struct-induced breakage (mips)
Signed-off-by: Al Viro <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
4927b3f74c
commit
91c7c56855
2 changed files with 13 additions and 5 deletions
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue