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/davinci_emac.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/davinci_emac.c')
-rw-r--r-- | drivers/net/davinci_emac.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 2b8edd2efbf6..1f9df5c6a75a 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c | |||
@@ -952,13 +952,14 @@ static void emac_dev_mcast_set(struct net_device *ndev) | |||
952 | emac_add_mcast(priv, EMAC_ALL_MULTI_SET, NULL); | 952 | emac_add_mcast(priv, EMAC_ALL_MULTI_SET, NULL); |
953 | } | 953 | } |
954 | if (!netdev_mc_empty(ndev)) { | 954 | if (!netdev_mc_empty(ndev)) { |
955 | struct dev_mc_list *mc_ptr; | 955 | struct netdev_hw_addr *ha; |
956 | |||
956 | mbp_enable = (mbp_enable | EMAC_MBP_RXMCAST); | 957 | mbp_enable = (mbp_enable | EMAC_MBP_RXMCAST); |
957 | emac_add_mcast(priv, EMAC_ALL_MULTI_CLR, NULL); | 958 | emac_add_mcast(priv, EMAC_ALL_MULTI_CLR, NULL); |
958 | /* program multicast address list into EMAC hardware */ | 959 | /* program multicast address list into EMAC hardware */ |
959 | netdev_for_each_mc_addr(mc_ptr, ndev) { | 960 | netdev_for_each_mc_addr(ha, ndev) { |
960 | emac_add_mcast(priv, EMAC_MULTICAST_ADD, | 961 | emac_add_mcast(priv, EMAC_MULTICAST_ADD, |
961 | (u8 *) mc_ptr->dmi_addr); | 962 | (u8 *) ha->addr); |
962 | } | 963 | } |
963 | } else { | 964 | } else { |
964 | mbp_enable = (mbp_enable & ~EMAC_MBP_RXMCAST); | 965 | mbp_enable = (mbp_enable & ~EMAC_MBP_RXMCAST); |