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/virtio_net.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/virtio_net.c')
-rw-r--r-- | drivers/net/virtio_net.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 3f5be35dea25..ecec9a8527f3 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
@@ -721,7 +721,6 @@ static void virtnet_set_rx_mode(struct net_device *dev) | |||
721 | struct scatterlist sg[2]; | 721 | struct scatterlist sg[2]; |
722 | u8 promisc, allmulti; | 722 | u8 promisc, allmulti; |
723 | struct virtio_net_ctrl_mac *mac_data; | 723 | struct virtio_net_ctrl_mac *mac_data; |
724 | struct dev_addr_list *addr; | ||
725 | struct netdev_hw_addr *ha; | 724 | struct netdev_hw_addr *ha; |
726 | int uc_count; | 725 | int uc_count; |
727 | int mc_count; | 726 | int mc_count; |
@@ -778,8 +777,8 @@ static void virtnet_set_rx_mode(struct net_device *dev) | |||
778 | 777 | ||
779 | mac_data->entries = mc_count; | 778 | mac_data->entries = mc_count; |
780 | i = 0; | 779 | i = 0; |
781 | netdev_for_each_mc_addr(addr, dev) | 780 | netdev_for_each_mc_addr(ha, dev) |
782 | memcpy(&mac_data->macs[i++][0], addr->da_addr, ETH_ALEN); | 781 | memcpy(&mac_data->macs[i++][0], ha->addr, ETH_ALEN); |
783 | 782 | ||
784 | sg_set_buf(&sg[1], mac_data, | 783 | sg_set_buf(&sg[1], mac_data, |
785 | sizeof(mac_data->entries) + (mc_count * ETH_ALEN)); | 784 | sizeof(mac_data->entries) + (mc_count * ETH_ALEN)); |