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/via-velocity.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/via-velocity.c')
-rw-r--r-- | drivers/net/via-velocity.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 3a486f3bad3d..91f3b841288c 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
@@ -1126,7 +1126,7 @@ static void velocity_set_multi(struct net_device *dev) | |||
1126 | struct mac_regs __iomem *regs = vptr->mac_regs; | 1126 | struct mac_regs __iomem *regs = vptr->mac_regs; |
1127 | u8 rx_mode; | 1127 | u8 rx_mode; |
1128 | int i; | 1128 | int i; |
1129 | struct dev_mc_list *mclist; | 1129 | struct netdev_hw_addr *ha; |
1130 | 1130 | ||
1131 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ | 1131 | if (dev->flags & IFF_PROMISC) { /* Set promiscuous. */ |
1132 | writel(0xffffffff, ®s->MARCAM[0]); | 1132 | writel(0xffffffff, ®s->MARCAM[0]); |
@@ -1142,8 +1142,8 @@ static void velocity_set_multi(struct net_device *dev) | |||
1142 | mac_get_cam_mask(regs, vptr->mCAMmask); | 1142 | mac_get_cam_mask(regs, vptr->mCAMmask); |
1143 | 1143 | ||
1144 | i = 0; | 1144 | i = 0; |
1145 | netdev_for_each_mc_addr(mclist, dev) { | 1145 | netdev_for_each_mc_addr(ha, dev) { |
1146 | mac_set_cam(regs, i + offset, mclist->dmi_addr); | 1146 | mac_set_cam(regs, i + offset, ha->addr); |
1147 | vptr->mCAMmask[(offset + i) / 8] |= 1 << ((offset + i) & 7); | 1147 | vptr->mCAMmask[(offset + i) / 8] |= 1 << ((offset + i) & 7); |
1148 | i++; | 1148 | i++; |
1149 | } | 1149 | } |