|
@@ -435,7 +435,7 @@ static void gmac_set_filter(struct net_device *dev)
|
|
|
unsigned int value = 0;
|
|
|
|
|
|
DBG(KERN_INFO "%s: # mcasts %d, # unicast %d\n",
|
|
|
- __func__, dev->mc_count, dev->uc_count);
|
|
|
+ __func__, dev->mc_count, dev->uc.count);
|
|
|
|
|
|
if (dev->flags & IFF_PROMISC)
|
|
|
value = GMAC_FRAME_FILTER_PR;
|
|
@@ -469,25 +469,17 @@ static void gmac_set_filter(struct net_device *dev)
|
|
|
}
|
|
|
|
|
|
/* Handle multiple unicast addresses (perfect filtering)*/
|
|
|
- if (dev->uc_count > GMAC_MAX_UNICAST_ADDRESSES)
|
|
|
+ if (dev->uc.count > GMAC_MAX_UNICAST_ADDRESSES)
|
|
|
/* Switch to promiscuous mode is more than 16 addrs
|
|
|
are required */
|
|
|
value |= GMAC_FRAME_FILTER_PR;
|
|
|
else {
|
|
|
- int i;
|
|
|
- struct dev_addr_list *uc_ptr = dev->uc_list;
|
|
|
-
|
|
|
- for (i = 0; i < dev->uc_count; i++) {
|
|
|
- gmac_set_umac_addr(ioaddr, uc_ptr->da_addr,
|
|
|
- i + 1);
|
|
|
-
|
|
|
- DBG(KERN_INFO "\t%d "
|
|
|
- "- Unicast addr %02x:%02x:%02x:%02x:%02x:"
|
|
|
- "%02x\n", i + 1,
|
|
|
- uc_ptr->da_addr[0], uc_ptr->da_addr[1],
|
|
|
- uc_ptr->da_addr[2], uc_ptr->da_addr[3],
|
|
|
- uc_ptr->da_addr[4], uc_ptr->da_addr[5]);
|
|
|
- uc_ptr = uc_ptr->next;
|
|
|
+ int reg = 1;
|
|
|
+ struct netdev_hw_addr *ha;
|
|
|
+
|
|
|
+ list_for_each_entry(ha, &dev->uc.list, list) {
|
|
|
+ gmac_set_umac_addr(ioaddr, ha->addr, reg);
|
|
|
+ reg++;
|
|
|
}
|
|
|
}
|
|
|
|