diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2012-01-24 13:47:56 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2012-01-27 06:21:01 +0000 |
| commit | 9f2a8d7ae8a74726024cc6b820e58d841199d37b (patch) | |
| tree | dd5e459258bae22045f0085a8a4edadb02f9f1ab /hw/pcnet.c | |
| parent | b1927cf1ae6161942dcca115f20a3e6e7b0a6cc3 (diff) | |
pcnet: 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>
Diffstat (limited to 'hw/pcnet.c')
| -rw-r--r-- | hw/pcnet.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/pcnet.c b/hw/pcnet.c index 306dc6ed7e..6aa48e0d24 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -688,7 +688,6 @@ static void pcnet_s_reset(PCNetState *s) printf("pcnet_s_reset\n"); #endif - s->lnkst = 0x40; s->rdra = 0; s->tdra = 0; s->rap = 0; @@ -1751,5 +1750,7 @@ int pcnet_common_init(DeviceState *dev, PCNetState *s, NetClientInfo *info) } *(uint16_t *)&s->prom[12] = cpu_to_le16(checksum); + s->lnkst = 0x40; /* initial link state: up */ + return 0; } |