Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6.git] / drivers / net / skfp / skfddi.c
index d9016b7..7912606 100644 (file)
@@ -852,7 +852,7 @@ static void skfp_ctl_set_multicast_list(struct net_device *dev)
 static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev)
 {
        struct s_smc *smc = netdev_priv(dev);
-       struct dev_mc_list *dmi;
+       struct netdev_hw_addr *ha;
 
        /* Enable promiscuous mode, if necessary */
        if (dev->flags & IFF_PROMISC) {
@@ -876,13 +876,13 @@ static void skfp_ctl_set_multicast_list_wo_lock(struct net_device *dev)
                                /* use exact filtering */
 
                                // point to first multicast addr
-                               netdev_for_each_mc_addr(dmi, dev) {
-                                       mac_add_multicast(smc, 
-                                                         (struct fddi_addr *)dmi->dmi_addr, 
-                                                         1);
+                               netdev_for_each_mc_addr(ha, dev) {
+                                       mac_add_multicast(smc,
+                                               (struct fddi_addr *)ha->addr,
+                                               1);
 
                                        pr_debug(KERN_INFO "ENABLE MC ADDRESS: %pMF\n",
-                                               dmi->dmi_addr);
+                                               ha->addr);
                                }
 
                        } else {        // more MC addresses than HW supports