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/sky2.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/sky2.c')
-rw-r--r-- | drivers/net/sky2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index f1c0ec308bf..5b97edb7a35 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -3627,7 +3627,7 @@ static void sky2_set_multicast(struct net_device *dev) | |||
3627 | struct sky2_port *sky2 = netdev_priv(dev); | 3627 | struct sky2_port *sky2 = netdev_priv(dev); |
3628 | struct sky2_hw *hw = sky2->hw; | 3628 | struct sky2_hw *hw = sky2->hw; |
3629 | unsigned port = sky2->port; | 3629 | unsigned port = sky2->port; |
3630 | struct dev_mc_list *list; | 3630 | struct netdev_hw_addr *ha; |
3631 | u16 reg; | 3631 | u16 reg; |
3632 | u8 filter[8]; | 3632 | u8 filter[8]; |
3633 | int rx_pause; | 3633 | int rx_pause; |
@@ -3651,8 +3651,8 @@ static void sky2_set_multicast(struct net_device *dev) | |||
3651 | if (rx_pause) | 3651 | if (rx_pause) |
3652 | sky2_add_filter(filter, pause_mc_addr); | 3652 | sky2_add_filter(filter, pause_mc_addr); |
3653 | 3653 | ||
3654 | netdev_for_each_mc_addr(list, dev) | 3654 | netdev_for_each_mc_addr(ha, dev) |
3655 | sky2_add_filter(filter, list->dmi_addr); | 3655 | sky2_add_filter(filter, ha->addr); |
3656 | } | 3656 | } |
3657 | 3657 | ||
3658 | gma_write16(hw, port, GM_MC_ADDR_H1, | 3658 | gma_write16(hw, port, GM_MC_ADDR_H1, |