Merge remote-tracking branch 'stefanha/net' into staging
# By Jan Kiszka # Via Stefan Hajnoczi * stefanha/net: pcnet: Flush queued packets on end of STOP state Message-id: 1375704975-19128-1-git-send-email-stefanha@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
commit
59a88774d9
@ -861,6 +861,8 @@ static void pcnet_init(PCNetState *s)
|
||||
|
||||
s->csr[0] |= 0x0101;
|
||||
s->csr[0] &= ~0x0004; /* clear STOP bit */
|
||||
|
||||
qemu_flush_queued_packets(qemu_get_queue(s->nic));
|
||||
}
|
||||
|
||||
static void pcnet_start(PCNetState *s)
|
||||
@ -878,6 +880,8 @@ static void pcnet_start(PCNetState *s)
|
||||
s->csr[0] &= ~0x0004; /* clear STOP bit */
|
||||
s->csr[0] |= 0x0002;
|
||||
pcnet_poll_timer(s);
|
||||
|
||||
qemu_flush_queued_packets(qemu_get_queue(s->nic));
|
||||
}
|
||||
|
||||
static void pcnet_stop(PCNetState *s)
|
||||
|
Loading…
Reference in New Issue
Block a user