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/mv643xx_eth.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/mv643xx_eth.c')
-rw-r--r-- | drivers/net/mv643xx_eth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index c97b6e4365a9..d5ebe43b0e65 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
@@ -1769,7 +1769,7 @@ static void mv643xx_eth_program_multicast_filter(struct net_device *dev) | |||
1769 | struct mv643xx_eth_private *mp = netdev_priv(dev); | 1769 | struct mv643xx_eth_private *mp = netdev_priv(dev); |
1770 | u32 *mc_spec; | 1770 | u32 *mc_spec; |
1771 | u32 *mc_other; | 1771 | u32 *mc_other; |
1772 | struct dev_addr_list *addr; | 1772 | struct netdev_hw_addr *ha; |
1773 | int i; | 1773 | int i; |
1774 | 1774 | ||
1775 | if (dev->flags & (IFF_PROMISC | IFF_ALLMULTI)) { | 1775 | if (dev->flags & (IFF_PROMISC | IFF_ALLMULTI)) { |
@@ -1794,8 +1794,8 @@ oom: | |||
1794 | memset(mc_spec, 0, 0x100); | 1794 | memset(mc_spec, 0, 0x100); |
1795 | memset(mc_other, 0, 0x100); | 1795 | memset(mc_other, 0, 0x100); |
1796 | 1796 | ||
1797 | netdev_for_each_mc_addr(addr, dev) { | 1797 | netdev_for_each_mc_addr(ha, dev) { |
1798 | u8 *a = addr->da_addr; | 1798 | u8 *a = ha->addr; |
1799 | u32 *table; | 1799 | u32 *table; |
1800 | int entry; | 1800 | int entry; |
1801 | 1801 | ||