Merge branch 'master' of /repos/git/net-next-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	net/ipv6/netfilter/ip6t_REJECT.c
	net/netfilter/xt_limit.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index 8cdcab7655c0..9a8bdea4a8ec 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -21,6 +21,7 @@
 #include <linux/module.h>
 #include <linux/clk.h>
 #include <linux/etherdevice.h>
+#include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/ethtool.h>
 #include <linux/crc32.h>
@@ -340,11 +341,9 @@ static int bcm_enet_receive_queue(struct net_device *dev, int budget)
                 }
 
                 skb_put(skb, len);
-                skb->dev = dev;
                 skb->protocol = eth_type_trans(skb, dev);
                 priv->stats.rx_packets++;
                 priv->stats.rx_bytes += len;
-                dev->last_rx = jiffies;
                 netif_receive_skb(skb);
 
         } while (--budget > 0);
@@ -604,7 +603,7 @@ static int bcm_enet_set_mac_address(struct net_device *dev, void *p)
 static void bcm_enet_set_multicast_list(struct net_device *dev)
 {
         struct bcm_enet_priv *priv;
-        struct dev_mc_list *mc_list;
+        struct netdev_hw_addr *ha;
         u32 val;
         int i;
 
@@ -632,14 +631,14 @@ static void bcm_enet_set_multicast_list(struct net_device *dev)
         }
 
         i = 0;
-        netdev_for_each_mc_addr(mc_list, dev) {
+        netdev_for_each_mc_addr(ha, dev) {
                 u8 *dmi_addr;
                 u32 tmp;
 
                 if (i == 3)
                         break;
                 /* update perfect match registers */
-                dmi_addr = mc_list->dmi_addr;
+                dmi_addr = ha->addr;
                 tmp = (dmi_addr[2] << 24) | (dmi_addr[3] << 16) |
                         (dmi_addr[4] << 8) | dmi_addr[5];
                 enet_writel(priv, tmp, ENET_PML_REG(i + 1));
@@ -959,7 +958,9 @@ static int bcm_enet_open(struct net_device *dev)
         /* all set, enable mac and interrupts, start dma engine and
          * kick rx dma channel */
         wmb();
-        enet_writel(priv, ENET_CTL_ENABLE_MASK, ENET_CTL_REG);
+        val = enet_readl(priv, ENET_CTL_REG);
+        val |= ENET_CTL_ENABLE_MASK;
+        enet_writel(priv, val, ENET_CTL_REG);
         enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG);
         enet_dma_writel(priv, ENETDMA_CHANCFG_EN_MASK,
                         ENETDMA_CHANCFG_REG(priv->rx_chan));