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)
         u8 promisc, allmulti;
         struct virtio_net_ctrl_mac *mac_data;
         struct dev_addr_list *addr;
+        struct netdev_hw_addr *ha;
         void *buf;
         int i;
 
@@ -718,9 +719,9 @@ static void virtnet_set_rx_mode(struct net_device *dev)
 
         /* Store the unicast list and count in the front of the buffer */
         mac_data->entries = dev->uc_count;
-        addr = dev->uc_list;
-        for (i = 0; i < dev->uc_count; i++, addr = addr->next)
-                memcpy(&mac_data->macs[i][0], addr->da_addr, ETH_ALEN);
+        i = 0;
+        list_for_each_entry(ha, &dev->uc_list, list)
+                memcpy(&mac_data->macs[i++][0], ha->addr, ETH_ALEN);
 
         sg_set_buf(&sg[0], mac_data,
                    sizeof(mac_data->entries) + (dev->uc_count * ETH_ALEN));