OSDN Git Service

pcnet: Flush queued packets on end of STOP state
authorJan Kiszka <jan.kiszka@siemens.com>
Fri, 2 Aug 2013 19:48:18 +0000 (21:48 +0200)
committerStefan Hajnoczi <stefanha@redhat.com>
Mon, 5 Aug 2013 12:11:17 +0000 (14:11 +0200)
Analogously to other NICs, we have to inform the network layer when
the can_receive handler will no longer report 0. Without this, we may
get stuck waiting on queued incoming packets.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
hw/net/pcnet.c

index b606d2b..63aa73a 100644 (file)
@@ -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)