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

diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index 6ad16205dc17..2bd1a5c0ec17 100644
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -129,7 +129,6 @@ static int xcvr[NUM_UNITS]; 			/* The data transfer mode. */
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/init.h>
@@ -883,11 +882,11 @@ static void set_rx_mode_8012(struct net_device *dev)
                 memset(mc_filter, 0xff, sizeof(mc_filter));
                 new_mode = CMR2h_Normal;
         } else {
-                struct dev_mc_list *mclist;
+                struct netdev_hw_addr *ha;
 
                 memset(mc_filter, 0, sizeof(mc_filter));
-                netdev_for_each_mc_addr(mclist, dev) {
-                        int filterbit = ether_crc_le(ETH_ALEN, mclist->dmi_addr) & 0x3f;
+                netdev_for_each_mc_addr(ha, dev) {
+                        int filterbit = ether_crc_le(ETH_ALEN, ha->addr) & 0x3f;
                         mc_filter[filterbit >> 5] |= 1 << (filterbit & 31);
                 }
                 new_mode = CMR2h_Normal;