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

diff --git a/drivers/net/cxgb3/xgmac.c b/drivers/net/cxgb3/xgmac.c
index c142a2132e9f..3af19a550372 100644
--- a/drivers/net/cxgb3/xgmac.c
+++ b/drivers/net/cxgb3/xgmac.c
@@ -311,16 +311,16 @@ int t3_mac_set_rx_mode(struct cmac *mac, struct net_device *dev)
         if (dev->flags & IFF_ALLMULTI)
                 hash_lo = hash_hi = 0xffffffff;
         else {
-                struct dev_mc_list *dmi;
+                struct netdev_hw_addr *ha;
                 int exact_addr_idx = mac->nucast;
 
                 hash_lo = hash_hi = 0;
-                netdev_for_each_mc_addr(dmi, dev)
+                netdev_for_each_mc_addr(ha, dev)
                         if (exact_addr_idx < EXACT_ADDR_FILTERS)
                                 set_addr_filter(mac, exact_addr_idx++,
-                                                dmi->dmi_addr);
+                                                ha->addr);
                         else {
-                                int hash = hash_hw_addr(dmi->dmi_addr);
+                                int hash = hash_hw_addr(ha->addr);
 
                                 if (hash < 32)
                                         hash_lo |= (1 << hash);