diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-11-13 11:48:02 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-11-13 11:48:03 -0800 |
| commit | b873a55cf45f1fbff7026de885848d52939d18e1 (patch) | |
| tree | c13513f8d4083f9b31399ab3cc80ea12332866cf /hw | |
| parent | deb0f500651317863922964c87b4fa64eecdbd73 (diff) | |
| parent | cc386e96727442f5b67052d4e0a602f6f652ffe6 (diff) | |
| download | focaccia-qemu-b873a55cf45f1fbff7026de885848d52939d18e1.tar.gz focaccia-qemu-b873a55cf45f1fbff7026de885848d52939d18e1.zip | |
Merge remote-tracking branch 'stefanha/net' into staging
# By Dmitry Fleytman (1) and others # Via Stefan Hajnoczi * stefanha/net: virtio-net: broken RX filtering logic fixed net: fix qemu_flush_queued_packets() in presence of a hub net: disallow to specify multicast MAC address Message-id: 1383928804-28866-1-git-send-email-stefanha@redhat.com Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/net/virtio-net.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index ae51d96a7a..613f144d12 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -657,7 +657,8 @@ static int virtio_net_handle_mac(VirtIONet *n, uint8_t cmd, } if (n->mac_table.in_use + mac_data.entries <= MAC_TABLE_ENTRIES) { - s = iov_to_buf(iov, iov_cnt, 0, n->mac_table.macs, + s = iov_to_buf(iov, iov_cnt, 0, + &n->mac_table.macs[n->mac_table.in_use * ETH_ALEN], mac_data.entries * ETH_ALEN); if (s != mac_data.entries * ETH_ALEN) { goto error; |