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/e100.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/e100.c')
-rw-r--r-- | drivers/net/e100.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index c0cd57656681..3e8d0005540f 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -1545,16 +1545,16 @@ static int e100_hw_init(struct nic *nic) | |||
1545 | static void e100_multi(struct nic *nic, struct cb *cb, struct sk_buff *skb) | 1545 | static void e100_multi(struct nic *nic, struct cb *cb, struct sk_buff *skb) |
1546 | { | 1546 | { |
1547 | struct net_device *netdev = nic->netdev; | 1547 | struct net_device *netdev = nic->netdev; |
1548 | struct dev_mc_list *list; | 1548 | struct netdev_hw_addr *ha; |
1549 | u16 i, count = min(netdev_mc_count(netdev), E100_MAX_MULTICAST_ADDRS); | 1549 | u16 i, count = min(netdev_mc_count(netdev), E100_MAX_MULTICAST_ADDRS); |
1550 | 1550 | ||
1551 | cb->command = cpu_to_le16(cb_multi); | 1551 | cb->command = cpu_to_le16(cb_multi); |
1552 | cb->u.multi.count = cpu_to_le16(count * ETH_ALEN); | 1552 | cb->u.multi.count = cpu_to_le16(count * ETH_ALEN); |
1553 | i = 0; | 1553 | i = 0; |
1554 | netdev_for_each_mc_addr(list, netdev) { | 1554 | netdev_for_each_mc_addr(ha, netdev) { |
1555 | if (i == count) | 1555 | if (i == count) |
1556 | break; | 1556 | break; |
1557 | memcpy(&cb->u.multi.addr[i++ * ETH_ALEN], &list->dmi_addr, | 1557 | memcpy(&cb->u.multi.addr[i++ * ETH_ALEN], &ha->addr, |
1558 | ETH_ALEN); | 1558 | ETH_ALEN); |
1559 | } | 1559 | } |
1560 | } | 1560 | } |