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, 8 insertions, 8 deletions

diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index 60777fd90b33..bdfff784645c 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -328,7 +328,7 @@ static int cpmac_config(struct net_device *dev, struct ifmap *map)
 
 static void cpmac_set_multicast_list(struct net_device *dev)
 {
-        struct dev_mc_list *iter;
+        struct netdev_hw_addr *ha;
         u8 tmp;
         u32 mbp, bit, hash[2] = { 0, };
         struct cpmac_priv *priv = netdev_priv(dev);
@@ -348,19 +348,19 @@ static void cpmac_set_multicast_list(struct net_device *dev)
                          * cpmac uses some strange mac address hashing
                          * (not crc32)
                          */
-                        netdev_for_each_mc_addr(iter, dev) {
+                        netdev_for_each_mc_addr(ha, dev) {
                                 bit = 0;
-                                tmp = iter->dmi_addr[0];
+                                tmp = ha->addr[0];
                                 bit  ^= (tmp >> 2) ^ (tmp << 4);
-                                tmp = iter->dmi_addr[1];
+                                tmp = ha->addr[1];
                                 bit  ^= (tmp >> 4) ^ (tmp << 2);
-                                tmp = iter->dmi_addr[2];
+                                tmp = ha->addr[2];
                                 bit  ^= (tmp >> 6) ^ tmp;
-                                tmp = iter->dmi_addr[3];
+                                tmp = ha->addr[3];
                                 bit  ^= (tmp >> 2) ^ (tmp << 4);
-                                tmp = iter->dmi_addr[4];
+                                tmp = ha->addr[4];
                                 bit  ^= (tmp >> 4) ^ (tmp << 2);
-                                tmp = iter->dmi_addr[5];
+                                tmp = ha->addr[5];
                                 bit  ^= (tmp >> 6) ^ tmp;
                                 bit &= 0x3f;
                                 hash[bit / 32] |= 1 << (bit % 32);