aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/virtio_net.c
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2009-05-22 19:22:17 -0400
committerDavid S. Miller <davem@davemloft.net>2009-05-30 01:12:32 -0400
commitccffad25b5136958d4769ed6de5e87992dd9c65c (patch)
treecd5f36fe67f4deeae23d76436f7a032a201cba44 /drivers/net/virtio_net.c
parentae63e808f508c38fe65e23a1480c85d5bd00ecbd (diff)
net: convert unicast addr list
This patch converts unicast address list to standard list_head using previously introduced struct netdev_hw_addr. It also relaxes the locking. Original spinlock (still used for multicast addresses) is not needed and is no longer used for a protection of this list. All reading and writing takes place under rtnl (with no changes). I also removed a possibility to specify the length of the address while adding or deleting unicast address. It's always dev->addr_len. The convertion touched especially e1000 and ixgbe codes when the change is not so trivial. Signed-off-by: Jiri Pirko <jpirko@redhat.com> drivers/net/bnx2.c | 13 +-- drivers/net/e1000/e1000_main.c | 24 +++-- drivers/net/ixgbe/ixgbe_common.c | 14 ++-- drivers/net/ixgbe/ixgbe_common.h | 4 +- drivers/net/ixgbe/ixgbe_main.c | 6 +- drivers/net/ixgbe/ixgbe_type.h | 4 +- drivers/net/macvlan.c | 11 +- drivers/net/mv643xx_eth.c | 11 +- drivers/net/niu.c | 7 +- drivers/net/virtio_net.c | 7 +- drivers/s390/net/qeth_l2_main.c | 6 +- drivers/scsi/fcoe/fcoe.c | 16 ++-- include/linux/netdevice.h | 18 ++-- net/8021q/vlan.c | 4 +- net/8021q/vlan_dev.c | 10 +- net/core/dev.c | 195 +++++++++++++++++++++++++++----------- net/dsa/slave.c | 10 +- net/packet/af_packet.c | 4 +- 18 files changed, 227 insertions(+), 137 deletions(-) Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/virtio_net.c')
-rw-r--r--drivers/net/virtio_net.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 6cc5bcd34fb0..0c9ca67f66e6 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -680,6 +680,7 @@ static void virtnet_set_rx_mode(struct net_device *dev)
680 u8 promisc, allmulti; 680 u8 promisc, allmulti;
681 struct virtio_net_ctrl_mac *mac_data; 681 struct virtio_net_ctrl_mac *mac_data;
682 struct dev_addr_list *addr; 682 struct dev_addr_list *addr;
683 struct netdev_hw_addr *ha;
683 void *buf; 684 void *buf;
684 int i; 685 int i;
685 686
@@ -718,9 +719,9 @@ static void virtnet_set_rx_mode(struct net_device *dev)
718 719
719 /* Store the unicast list and count in the front of the buffer */ 720 /* Store the unicast list and count in the front of the buffer */
720 mac_data->entries = dev->uc_count; 721 mac_data->entries = dev->uc_count;
721 addr = dev->uc_list; 722 i = 0;
722 for (i = 0; i < dev->uc_count; i++, addr = addr->next) 723 list_for_each_entry(ha, &dev->uc_list, list)
723 memcpy(&mac_data->macs[i][0], addr->da_addr, ETH_ALEN); 724 memcpy(&mac_data->macs[i++][0], ha->addr, ETH_ALEN);
724 725
725 sg_set_buf(&sg[0], mac_data, 726 sg_set_buf(&sg[0], mac_data,
726 sizeof(mac_data->entries) + (dev->uc_count * ETH_ALEN)); 727 sizeof(mac_data->entries) + (dev->uc_count * ETH_ALEN));