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/igb | |
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/igb')
-rw-r--r-- | drivers/net/igb/igb_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index ea875709f053..78cc742e233f 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -2864,7 +2864,7 @@ static int igb_write_mc_addr_list(struct net_device *netdev) | |||
2864 | { | 2864 | { |
2865 | struct igb_adapter *adapter = netdev_priv(netdev); | 2865 | struct igb_adapter *adapter = netdev_priv(netdev); |
2866 | struct e1000_hw *hw = &adapter->hw; | 2866 | struct e1000_hw *hw = &adapter->hw; |
2867 | struct dev_mc_list *mc_ptr; | 2867 | struct netdev_hw_addr *ha; |
2868 | u8 *mta_list; | 2868 | u8 *mta_list; |
2869 | int i; | 2869 | int i; |
2870 | 2870 | ||
@@ -2881,8 +2881,8 @@ static int igb_write_mc_addr_list(struct net_device *netdev) | |||
2881 | 2881 | ||
2882 | /* The shared function expects a packed array of only addresses. */ | 2882 | /* The shared function expects a packed array of only addresses. */ |
2883 | i = 0; | 2883 | i = 0; |
2884 | netdev_for_each_mc_addr(mc_ptr, netdev) | 2884 | netdev_for_each_mc_addr(ha, netdev) |
2885 | memcpy(mta_list + (i++ * ETH_ALEN), mc_ptr->dmi_addr, ETH_ALEN); | 2885 | memcpy(mta_list + (i++ * ETH_ALEN), ha->addr, ETH_ALEN); |
2886 | 2886 | ||
2887 | igb_update_mc_addr_list(hw, mta_list, i); | 2887 | igb_update_mc_addr_list(hw, mta_list, i); |
2888 | kfree(mta_list); | 2888 | kfree(mta_list); |