diff options
Diffstat (limited to 'drivers/net/s2io.c')
-rw-r--r-- | drivers/net/s2io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index d1664586e8ff..102be16e9b52 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -5055,8 +5055,8 @@ static void s2io_set_multicast(struct net_device *dev) | |||
5055 | } | 5055 | } |
5056 | 5056 | ||
5057 | /* Update individual M_CAST address list */ | 5057 | /* Update individual M_CAST address list */ |
5058 | if ((!sp->m_cast_flg) && dev->mc_count) { | 5058 | if ((!sp->m_cast_flg) && netdev_mc_count(dev)) { |
5059 | if (dev->mc_count > | 5059 | if (netdev_mc_count(dev) > |
5060 | (config->max_mc_addr - config->max_mac_addr)) { | 5060 | (config->max_mc_addr - config->max_mac_addr)) { |
5061 | DBG_PRINT(ERR_DBG, | 5061 | DBG_PRINT(ERR_DBG, |
5062 | "%s: No more Rx filters can be added - " | 5062 | "%s: No more Rx filters can be added - " |
@@ -5066,7 +5066,7 @@ static void s2io_set_multicast(struct net_device *dev) | |||
5066 | } | 5066 | } |
5067 | 5067 | ||
5068 | prev_cnt = sp->mc_addr_count; | 5068 | prev_cnt = sp->mc_addr_count; |
5069 | sp->mc_addr_count = dev->mc_count; | 5069 | sp->mc_addr_count = netdev_mc_count(dev); |
5070 | 5070 | ||
5071 | /* Clear out the previous list of Mc in the H/W. */ | 5071 | /* Clear out the previous list of Mc in the H/W. */ |
5072 | for (i = 0; i < prev_cnt; i++) { | 5072 | for (i = 0; i < prev_cnt; i++) { |
@@ -5092,7 +5092,7 @@ static void s2io_set_multicast(struct net_device *dev) | |||
5092 | } | 5092 | } |
5093 | 5093 | ||
5094 | /* Create the new Rx filter list and update the same in H/W. */ | 5094 | /* Create the new Rx filter list and update the same in H/W. */ |
5095 | for (i = 0, mclist = dev->mc_list; i < dev->mc_count; | 5095 | for (i = 0, mclist = dev->mc_list; i < netdev_mc_count(dev); |
5096 | i++, mclist = mclist->next) { | 5096 | i++, mclist = mclist->next) { |
5097 | memcpy(sp->usr_addrs[i].addr, mclist->dmi_addr, | 5097 | memcpy(sp->usr_addrs[i].addr, mclist->dmi_addr, |
5098 | ETH_ALEN); | 5098 | ETH_ALEN); |