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, 4 insertions, 3 deletions

diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 209742304e20..6bd03c8b8886 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -18,6 +18,7 @@
 #include <linux/phy.h>
 #include <linux/platform_device.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 #include <net/ethoc.h>
 
 static int buffer_size = 0x8000; /* 32 KBytes */
@@ -755,7 +756,7 @@ static void ethoc_set_multicast_list(struct net_device *dev)
 {
         struct ethoc *priv = netdev_priv(dev);
         u32 mode = ethoc_read(priv, MODER);
-        struct dev_mc_list *mc;
+        struct netdev_hw_addr *ha;
         u32 hash[2] = { 0, 0 };
 
         /* set loopback mode if requested */
@@ -783,8 +784,8 @@ static void ethoc_set_multicast_list(struct net_device *dev)
                 hash[0] = 0xffffffff;
                 hash[1] = 0xffffffff;
         } else {
-                netdev_for_each_mc_addr(mc, dev) {
-                        u32 crc = ether_crc(ETH_ALEN, mc->dmi_addr);
+                netdev_for_each_mc_addr(ha, dev) {
+                        u32 crc = ether_crc(ETH_ALEN, ha->addr);
                         int bit = (crc >> 26) & 0x3f;
                         hash[bit >> 5] |= 1 << (bit & 0x1f);
                 }