diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/net/e1000.c | 2 | ||||
| -rw-r--r-- | hw/net/rtl8139.c | 5 | ||||
| -rw-r--r-- | hw/net/virtio-net.c | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 8387443ee3..ae6359117d 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1106,7 +1106,7 @@ mac_writereg(E1000State *s, int index, uint32_t val) s->mac_reg[index] = val; - if (index == RA + 1) { + if (index == RA || index == RA + 1) { macaddr[0] = cpu_to_le32(s->mac_reg[RA]); macaddr[1] = cpu_to_le32(s->mac_reg[RA + 1]); qemu_format_nic_info_str(qemu_get_queue(s->nic), (uint8_t *)macaddr); diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 5329f44a9d..7f2b4db449 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -2741,10 +2741,7 @@ static void rtl8139_io_writeb(void *opaque, uint8_t addr, uint32_t val) switch (addr) { - case MAC0 ... MAC0+4: - s->phys[addr - MAC0] = val; - break; - case MAC0+5: + case MAC0 ... MAC0+5: s->phys[addr - MAC0] = val; qemu_format_nic_info_str(qemu_get_queue(s->nic), s->phys); break; 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; |