|
@@ -899,7 +899,7 @@ static void __cp_set_rx_mode (struct net_device *dev)
|
|
|
{
|
|
|
struct cp_private *cp = netdev_priv(dev);
|
|
|
u32 mc_filter[2]; /* Multicast hash filter */
|
|
|
- int i, rx_mode;
|
|
|
+ int rx_mode;
|
|
|
u32 tmp;
|
|
|
|
|
|
/* Note: do not reorder, GCC is clever about common statements. */
|
|
@@ -909,7 +909,7 @@ static void __cp_set_rx_mode (struct net_device *dev)
|
|
|
AcceptBroadcast | AcceptMulticast | AcceptMyPhys |
|
|
|
AcceptAllPhys;
|
|
|
mc_filter[1] = mc_filter[0] = 0xffffffff;
|
|
|
- } else if ((dev->mc_count > multicast_filter_limit) ||
|
|
|
+ } else if ((netdev_mc_count(dev) > multicast_filter_limit) ||
|
|
|
(dev->flags & IFF_ALLMULTI)) {
|
|
|
/* Too many to filter perfectly -- accept all multicasts. */
|
|
|
rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys;
|
|
@@ -918,8 +918,7 @@ static void __cp_set_rx_mode (struct net_device *dev)
|
|
|
struct dev_mc_list *mclist;
|
|
|
rx_mode = AcceptBroadcast | AcceptMyPhys;
|
|
|
mc_filter[1] = mc_filter[0] = 0;
|
|
|
- for (i = 0, mclist = dev->mc_list; mclist && i < dev->mc_count;
|
|
|
- i++, mclist = mclist->next) {
|
|
|
+ netdev_for_each_mc_addr(mclist, dev) {
|
|
|
int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
|
|
|
|
|
|
mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
|