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/igbvf | |
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/igbvf')
-rw-r--r-- | drivers/net/igbvf/netdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c index a77afd8a14bb..ea8abf5c1ef2 100644 --- a/drivers/net/igbvf/netdev.c +++ b/drivers/net/igbvf/netdev.c | |||
@@ -1399,7 +1399,7 @@ static void igbvf_set_multi(struct net_device *netdev) | |||
1399 | { | 1399 | { |
1400 | struct igbvf_adapter *adapter = netdev_priv(netdev); | 1400 | struct igbvf_adapter *adapter = netdev_priv(netdev); |
1401 | struct e1000_hw *hw = &adapter->hw; | 1401 | struct e1000_hw *hw = &adapter->hw; |
1402 | struct dev_mc_list *mc_ptr; | 1402 | struct netdev_hw_addr *ha; |
1403 | u8 *mta_list = NULL; | 1403 | u8 *mta_list = NULL; |
1404 | int i; | 1404 | int i; |
1405 | 1405 | ||
@@ -1414,8 +1414,8 @@ static void igbvf_set_multi(struct net_device *netdev) | |||
1414 | 1414 | ||
1415 | /* prepare a packed array of only addresses. */ | 1415 | /* prepare a packed array of only addresses. */ |
1416 | i = 0; | 1416 | i = 0; |
1417 | netdev_for_each_mc_addr(mc_ptr, netdev) | 1417 | netdev_for_each_mc_addr(ha, netdev) |
1418 | memcpy(mta_list + (i++ * ETH_ALEN), mc_ptr->dmi_addr, ETH_ALEN); | 1418 | memcpy(mta_list + (i++ * ETH_ALEN), ha->addr, ETH_ALEN); |
1419 | 1419 | ||
1420 | hw->mac.ops.update_mc_addr_list(hw, mta_list, i, 0, 0); | 1420 | hw->mac.ops.update_mc_addr_list(hw, mta_list, i, 0, 0); |
1421 | kfree(mta_list); | 1421 | kfree(mta_list); |