aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethoc.c
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2010-04-01 17:22:57 -0400
committerDavid S. Miller <davem@davemloft.net>2010-04-03 17:22:15 -0400
commit22bedad3ce112d5ca1eaf043d4990fa2ed698c87 (patch)
treeb6fba5688d48b1396f01d13ee53610dea7749c15 /drivers/net/ethoc.c
parenta748ee2426817a95b1f03012d8f339c45c722ae1 (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/ethoc.c')
-rw-r--r--drivers/net/ethoc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 209742304e2..f6be5aeaf94 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -755,7 +755,7 @@ static void ethoc_set_multicast_list(struct net_device *dev)
755{ 755{
756 struct ethoc *priv = netdev_priv(dev); 756 struct ethoc *priv = netdev_priv(dev);
757 u32 mode = ethoc_read(priv, MODER); 757 u32 mode = ethoc_read(priv, MODER);
758 struct dev_mc_list *mc; 758 struct netdev_hw_addr *ha;
759 u32 hash[2] = { 0, 0 }; 759 u32 hash[2] = { 0, 0 };
760 760
761 /* set loopback mode if requested */ 761 /* set loopback mode if requested */
@@ -783,8 +783,8 @@ static void ethoc_set_multicast_list(struct net_device *dev)
783 hash[0] = 0xffffffff; 783 hash[0] = 0xffffffff;
784 hash[1] = 0xffffffff; 784 hash[1] = 0xffffffff;
785 } else { 785 } else {
786 netdev_for_each_mc_addr(mc, dev) { 786 netdev_for_each_mc_addr(ha, dev) {
787 u32 crc = ether_crc(ETH_ALEN, mc->dmi_addr); 787 u32 crc = ether_crc(ETH_ALEN, ha->addr);
788 int bit = (crc >> 26) & 0x3f; 788 int bit = (crc >> 26) & 0x3f;
789 hash[bit >> 5] |= 1 << (bit & 0x1f); 789 hash[bit >> 5] |= 1 << (bit & 0x1f);
790 } 790 }