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/ni52.c | |
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/ni52.c')
-rw-r--r-- | drivers/net/ni52.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c index 05c29c2cef2a..a76fabe26292 100644 --- a/drivers/net/ni52.c +++ b/drivers/net/ni52.c | |||
@@ -596,7 +596,7 @@ static int init586(struct net_device *dev) | |||
596 | struct iasetup_cmd_struct __iomem *ias_cmd; | 596 | struct iasetup_cmd_struct __iomem *ias_cmd; |
597 | struct tdr_cmd_struct __iomem *tdr_cmd; | 597 | struct tdr_cmd_struct __iomem *tdr_cmd; |
598 | struct mcsetup_cmd_struct __iomem *mc_cmd; | 598 | struct mcsetup_cmd_struct __iomem *mc_cmd; |
599 | struct dev_mc_list *dmi; | 599 | struct netdev_hw_addr *ha; |
600 | int num_addrs = netdev_mc_count(dev); | 600 | int num_addrs = netdev_mc_count(dev); |
601 | 601 | ||
602 | ptr = p->scb + 1; | 602 | ptr = p->scb + 1; |
@@ -725,8 +725,8 @@ static int init586(struct net_device *dev) | |||
725 | writew(num_addrs * 6, &mc_cmd->mc_cnt); | 725 | writew(num_addrs * 6, &mc_cmd->mc_cnt); |
726 | 726 | ||
727 | i = 0; | 727 | i = 0; |
728 | netdev_for_each_mc_addr(dmi, dev) | 728 | netdev_for_each_mc_addr(ha, dev) |
729 | memcpy_toio(mc_cmd->mc_list[i++], dmi->dmi_addr, 6); | 729 | memcpy_toio(mc_cmd->mc_list[i++], ha->addr, 6); |
730 | 730 | ||
731 | writew(make16(mc_cmd), &p->scb->cbl_offset); | 731 | writew(make16(mc_cmd), &p->scb->cbl_offset); |
732 | writeb(CUC_START, &p->scb->cmd_cuc); | 732 | writeb(CUC_START, &p->scb->cmd_cuc); |