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/ixgb/ixgb_main.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/ixgb/ixgb_main.c')
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index c9fef65cb98b..912dd1d5772c 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
@@ -1058,7 +1058,7 @@ ixgb_set_multi(struct net_device *netdev) | |||
1058 | { | 1058 | { |
1059 | struct ixgb_adapter *adapter = netdev_priv(netdev); | 1059 | struct ixgb_adapter *adapter = netdev_priv(netdev); |
1060 | struct ixgb_hw *hw = &adapter->hw; | 1060 | struct ixgb_hw *hw = &adapter->hw; |
1061 | struct dev_mc_list *mc_ptr; | 1061 | struct netdev_hw_addr *ha; |
1062 | u32 rctl; | 1062 | u32 rctl; |
1063 | int i; | 1063 | int i; |
1064 | 1064 | ||
@@ -1089,9 +1089,9 @@ ixgb_set_multi(struct net_device *netdev) | |||
1089 | IXGB_WRITE_REG(hw, RCTL, rctl); | 1089 | IXGB_WRITE_REG(hw, RCTL, rctl); |
1090 | 1090 | ||
1091 | i = 0; | 1091 | i = 0; |
1092 | netdev_for_each_mc_addr(mc_ptr, netdev) | 1092 | netdev_for_each_mc_addr(ha, netdev) |
1093 | memcpy(&mta[i++ * IXGB_ETH_LENGTH_OF_ADDRESS], | 1093 | memcpy(&mta[i++ * IXGB_ETH_LENGTH_OF_ADDRESS], |
1094 | mc_ptr->dmi_addr, IXGB_ETH_LENGTH_OF_ADDRESS); | 1094 | ha->addr, IXGB_ETH_LENGTH_OF_ADDRESS); |
1095 | 1095 | ||
1096 | ixgb_mc_addr_list_update(hw, mta, netdev_mc_count(netdev), 0); | 1096 | ixgb_mc_addr_list_update(hw, mta, netdev_mc_count(netdev), 0); |
1097 | } | 1097 | } |