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/eexpress.c b/drivers/net/eexpress.c
index 7013dc8a6cbc..c31dd0685553 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -111,7 +111,6 @@
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
-#include <linux/slab.h>
 #include <linux/mca-legacy.h>
 #include <linux/spinlock.h>
 #include <linux/bitops.h>
@@ -1576,7 +1575,7 @@ static void eexp_hw_init586(struct net_device *dev)
 
 static void eexp_setup_filter(struct net_device *dev)
 {
-        struct dev_mc_list *dmi;
+        struct netdev_hw_addr *ha;
         unsigned short ioaddr = dev->base_addr;
         int count = netdev_mc_count(dev);
         int i;
@@ -1589,8 +1588,8 @@ static void eexp_setup_filter(struct net_device *dev)
         outw(CONF_NR_MULTICAST & ~31, ioaddr+SM_PTR);
         outw(6*count, ioaddr+SHADOW(CONF_NR_MULTICAST));
         i = 0;
-        netdev_for_each_mc_addr(dmi, dev) {
-                unsigned short *data = (unsigned short *) dmi->dmi_addr;
+        netdev_for_each_mc_addr(ha, dev) {
+                unsigned short *data = (unsigned short *) ha->addr;
 
                 if (i == count)
                         break;