aboutsummaryrefslogtreecommitdiff
path: root/hw/net
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2015-06-25 10:18:05 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2015-07-07 13:10:26 +0100
commit5df6a1855b62dc653515d919e48c5b6f00c48f32 (patch)
treec59da9a485f47610aba2ca118ecc08f98658040d /hw/net
parentec50dd4634ae06091e61f42b7ba975f9ed510ad0 (diff)
downloadqemu-5df6a1855b62dc653515d919e48c5b6f00c48f32.zip
qemu-5df6a1855b62dc653515d919e48c5b6f00c48f32.tar.gz
qemu-5df6a1855b62dc653515d919e48c5b6f00c48f32.tar.bz2
e1000: flush packets when link comes up
e1000_can_receive() checks the link up status register bit. If the bit is clear, packets will be queued and the peer may disable receive to avoid wasting CPU reading packets that cannot be delivered. The queue must be flushed once the link comes back up again. This patch fixes broken e1000 receive with Mac OS X Snow Leopard guests and tap networking. Flushing the queue invokes the async send callback, which re-enables tap fd read. Reported-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> Message-id: 1435223885-12745-1-git-send-email-stefanha@redhat.com
Diffstat (limited to 'hw/net')
-rw-r--r--hw/net/e1000.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index bab8e2a..5c6bcd0 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -185,6 +185,9 @@ e1000_link_up(E1000State *s)
{
s->mac_reg[STATUS] |= E1000_STATUS_LU;
s->phy_reg[PHY_STATUS] |= MII_SR_LINK_STATUS;
+
+ /* E1000_STATUS_LU is tested by e1000_can_receive() */
+ qemu_flush_queued_packets(qemu_get_queue(s->nic));
}
static bool