diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-04-01 17:22:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-03 17:22:15 -0400 |
commit | 22bedad3ce112d5ca1eaf043d4990fa2ed698c87 (patch) | |
tree | b6fba5688d48b1396f01d13ee53610dea7749c15 /drivers/net/ibm_newemac | |
parent | a748ee2426817a95b1f03012d8f339c45c722ae1 (diff) |
net: convert multicast list to list_head
Converts the list and the core manipulating with it to be the same as uc_list.
+uses two functions for adding/removing mc address (normal and "global"
variant) instead of a function parameter.
+removes dev_mcast.c completely.
+exposes netdev_hw_addr_list_* macros along with __hw_addr_* functions for
manipulation with lists on a sandbox (used in bonding and 80211 drivers)
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ibm_newemac')
-rw-r--r-- | drivers/net/ibm_newemac/core.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index d8533a4ef825..40c78507ef16 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c | |||
@@ -388,18 +388,19 @@ static void emac_hash_mc(struct emac_instance *dev) | |||
388 | const int regs = EMAC_XAHT_REGS(dev); | 388 | const int regs = EMAC_XAHT_REGS(dev); |
389 | u32 *gaht_base = emac_gaht_base(dev); | 389 | u32 *gaht_base = emac_gaht_base(dev); |
390 | u32 gaht_temp[regs]; | 390 | u32 gaht_temp[regs]; |
391 | struct dev_mc_list *dmi; | 391 | struct netdev_hw_addr *ha; |
392 | int i; | 392 | int i; |
393 | 393 | ||
394 | DBG(dev, "hash_mc %d" NL, netdev_mc_count(dev->ndev)); | 394 | DBG(dev, "hash_mc %d" NL, netdev_mc_count(dev->ndev)); |
395 | 395 | ||
396 | memset(gaht_temp, 0, sizeof (gaht_temp)); | 396 | memset(gaht_temp, 0, sizeof (gaht_temp)); |
397 | 397 | ||
398 | netdev_for_each_mc_addr(dmi, dev->ndev) { | 398 | netdev_for_each_mc_addr(ha, dev->ndev) { |
399 | int slot, reg, mask; | 399 | int slot, reg, mask; |
400 | DBG2(dev, "mc %pM" NL, dmi->dmi_addr); | 400 | DBG2(dev, "mc %pM" NL, ha->addr); |
401 | 401 | ||
402 | slot = EMAC_XAHT_CRC_TO_SLOT(dev, ether_crc(ETH_ALEN, dmi->dmi_addr)); | 402 | slot = EMAC_XAHT_CRC_TO_SLOT(dev, |
403 | ether_crc(ETH_ALEN, ha->addr)); | ||
403 | reg = EMAC_XAHT_SLOT_TO_REG(dev, slot); | 404 | reg = EMAC_XAHT_SLOT_TO_REG(dev, slot); |
404 | mask = EMAC_XAHT_SLOT_TO_MASK(dev, slot); | 405 | mask = EMAC_XAHT_SLOT_TO_MASK(dev, slot); |
405 | 406 | ||
@@ -1176,7 +1177,7 @@ static int emac_open(struct net_device *ndev) | |||
1176 | netif_carrier_on(dev->ndev); | 1177 | netif_carrier_on(dev->ndev); |
1177 | 1178 | ||
1178 | /* Required for Pause packet support in EMAC */ | 1179 | /* Required for Pause packet support in EMAC */ |
1179 | dev_mc_add(ndev, default_mcast_addr, sizeof(default_mcast_addr), 1); | 1180 | dev_mc_add_global(ndev, default_mcast_addr); |
1180 | 1181 | ||
1181 | emac_configure(dev); | 1182 | emac_configure(dev); |
1182 | mal_poll_add(dev->mal, &dev->commac); | 1183 | mal_poll_add(dev->mal, &dev->commac); |