Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/usb/input/hid.h

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index 9997081c6dae..c41ae4286eea 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;
@@ -1098,7 +1100,7 @@ static void eth_tx_fill_frag_descs(struct mv643xx_private *mp,
                                          ETH_TX_ENABLE_INTERRUPT;
                         mp->tx_skb[tx_index] = skb;
                 } else
-                        mp->tx_skb[tx_index] = 0;
+                        mp->tx_skb[tx_index] = NULL;
 
                 desc = &mp->p_tx_desc_area[tx_index];
                 desc->l4i_chk = 0;
@@ -1134,7 +1136,7 @@ static void eth_tx_submit_descs_for_skb(struct mv643xx_private *mp,
                 eth_tx_fill_frag_descs(mp, skb);
 
                 length = skb_headlen(skb);
-                mp->tx_skb[tx_index] = 0;
+                mp->tx_skb[tx_index] = NULL;
         } else {
                 cmd_sts |= ETH_ZERO_PADDING |
                            ETH_TX_LAST_DESC |
@@ -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);