Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

1 files changed, 4 insertions, 10 deletions

diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index 8249a394a4e1..2678588ea4b2 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -788,7 +788,6 @@ static void mdio_write(struct net_device *dev, int phy_id, int location, int val
                 iowrite8(MDIO_EnbIn | MDIO_ShiftClk, mdio_addr);
                 mdio_delay();
         }
-        return;
 }
 
 static int mdio_wait_link(struct net_device *dev, int wait)
@@ -972,7 +971,7 @@ static void tx_timeout(struct net_device *dev)
 
         dev->if_port = 0;
 
-        dev->trans_start = jiffies;
+        dev->trans_start = jiffies; /* prevent tx timeout */
         dev->stats.tx_errors++;
         if (np->cur_tx - np->dirty_tx < TX_QUEUE_LEN - 4) {
                 netif_wake_queue(dev);
@@ -1022,7 +1021,6 @@ static void init_ring(struct net_device *dev)
                 np->tx_skbuff[i] = NULL;
                 np->tx_ring[i].status = 0;
         }
-        return;
 }
 
 static void tx_poll (unsigned long data)
@@ -1049,7 +1047,6 @@ static void tx_poll (unsigned long data)
         if (ioread32 (np->base + TxListPtr) == 0)
                 iowrite32 (np->tx_ring_dma + head * sizeof(struct netdev_desc),
                         np->base + TxListPtr);
-        return;
 }
 
 static netdev_tx_t
@@ -1084,7 +1081,6 @@ start_tx (struct sk_buff *skb, struct net_device *dev)
         } else {
                 netif_stop_queue (dev);
         }
-        dev->trans_start = jiffies;
         if (netif_msg_tx_queued(np)) {
                 printk (KERN_DEBUG
                         "%s: Transmit frame #%d queued in slot %d.\n",
@@ -1379,7 +1375,6 @@ not_done:
         if (np->budget <= 0)
                 np->budget = RX_BUDGET;
         tasklet_schedule(&np->rx_tasklet);
-        return;
 }
 
 static void refill_rx (struct net_device *dev)
@@ -1410,7 +1405,6 @@ static void refill_rx (struct net_device *dev)
                 np->rx_ring[entry].status = 0;
                 cnt++;
         }
-        return;
 }
 static void netdev_error(struct net_device *dev, int intr_status)
 {
@@ -1522,13 +1516,13 @@ static void set_rx_mode(struct net_device *dev)
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
         } else if (!netdev_mc_empty(dev)) {
-                struct dev_mc_list *mclist;
+                struct netdev_hw_addr *ha;
                 int bit;
                 int index;
                 int crc;
                 memset (mc_filter, 0, sizeof (mc_filter));
-                netdev_for_each_mc_addr(mclist, dev) {
-                        crc = ether_crc_le (ETH_ALEN, mclist->dmi_addr);
+                netdev_for_each_mc_addr(ha, dev) {
+                        crc = ether_crc_le(ETH_ALEN, ha->addr);
                         for (index=0, bit=0; bit < 6; bit++, crc <<= 1)
                                 if (crc & 0x80000000) index |= 1 << bit;
                         mc_filter[index/16] |= (1 << (index % 16));