From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Tue, 24 Jan 2012 12:47:46 +0000 (+0100)
Subject: e1000: Preserve link state across device reset
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b1927cf1ae6161942dcca115f20a3e6e7b0a6cc3;p=qemu-xen-4.6-testing.git

e1000: Preserve link state across device reset

A device reset does not affect the link state, only set_link does.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---

diff --git a/hw/e1000.c b/hw/e1000.c
index 86c5416bd..76e736f17 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -1133,6 +1133,11 @@ static void e1000_reset(void *opaque)
     memmove(d->mac_reg, mac_reg_init, sizeof mac_reg_init);
     d->rxbuf_min_shift = 1;
     memset(&d->tx, 0, sizeof d->tx);
+
+    if (d->nic->nc.link_down) {
+        d->mac_reg[STATUS] &= ~E1000_STATUS_LU;
+        d->phy_reg[PHY_STATUS] &= ~MII_SR_LINK_STATUS;
+    }
 }
 
 static NetClientInfo net_e1000_info = {