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/3c523.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/3c523.c')
-rw-r--r-- | drivers/net/3c523.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c index beed4fa10c6e..966cb12e1e0a 100644 --- a/drivers/net/3c523.c +++ b/drivers/net/3c523.c | |||
@@ -625,7 +625,7 @@ static int init586(struct net_device *dev) | |||
625 | volatile struct iasetup_cmd_struct *ias_cmd; | 625 | volatile struct iasetup_cmd_struct *ias_cmd; |
626 | volatile struct tdr_cmd_struct *tdr_cmd; | 626 | volatile struct tdr_cmd_struct *tdr_cmd; |
627 | volatile struct mcsetup_cmd_struct *mc_cmd; | 627 | volatile struct mcsetup_cmd_struct *mc_cmd; |
628 | struct dev_mc_list *dmi; | 628 | struct netdev_hw_addr *ha; |
629 | int num_addrs = netdev_mc_count(dev); | 629 | int num_addrs = netdev_mc_count(dev); |
630 | 630 | ||
631 | ptr = (void *) ((char *) p->scb + sizeof(struct scb_struct)); | 631 | ptr = (void *) ((char *) p->scb + sizeof(struct scb_struct)); |
@@ -788,8 +788,9 @@ static int init586(struct net_device *dev) | |||
788 | mc_cmd->cmd_link = 0xffff; | 788 | mc_cmd->cmd_link = 0xffff; |
789 | mc_cmd->mc_cnt = num_addrs * 6; | 789 | mc_cmd->mc_cnt = num_addrs * 6; |
790 | i = 0; | 790 | i = 0; |
791 | netdev_for_each_mc_addr(dmi, dev) | 791 | netdev_for_each_mc_addr(ha, dev) |
792 | memcpy((char *) mc_cmd->mc_list[i++], dmi->dmi_addr, 6); | 792 | memcpy((char *) mc_cmd->mc_list[i++], |
793 | ha->addr, 6); | ||
793 | p->scb->cbl_offset = make16(mc_cmd); | 794 | p->scb->cbl_offset = make16(mc_cmd); |
794 | p->scb->cmd = CUC_START; | 795 | p->scb->cmd = CUC_START; |
795 | elmc_id_attn586(); | 796 | elmc_id_attn586(); |