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

diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index 5c07b147ec99..38395dfa4963 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -1533,7 +1533,7 @@ static void do_mc32_set_multicast_list(struct net_device *dev, int retry)
         {
                 unsigned char block[62];
                 unsigned char *bp;
-                struct dev_mc_list *dmc;
+                struct netdev_hw_addr *ha;
 
                 if(retry==0)
                         lp->mc_list_valid = 0;
@@ -1543,8 +1543,8 @@ static void do_mc32_set_multicast_list(struct net_device *dev, int retry)
                         block[0]=netdev_mc_count(dev);
                         bp=block+2;
 
-                        netdev_for_each_mc_addr(dmc, dev) {
-                                memcpy(bp, dmc->dmi_addr, 6);
+                        netdev_for_each_mc_addr(ha, dev) {
+                                memcpy(bp, ha->addr, 6);
                                 bp+=6;
                         }
                         if(mc32_command_nowait(dev, 2, block,