projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b1927cf
)
pcnet: Preserve link state across device reset
author
Jan Kiszka
<jan.kiszka@siemens.com>
Tue, 24 Jan 2012 12:47:56 +0000
(13:47 +0100)
committer
Stefan Hajnoczi
<stefanha@linux.vnet.ibm.com>
Fri, 27 Jan 2012 06:21:01 +0000
(06:21 +0000)
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>
hw/pcnet.c
patch
|
blob
|
history
diff --git
a/hw/pcnet.c
b/hw/pcnet.c
index 306dc6ed7ebc61e5f42bffea70262629c5363e08..6aa48e0d2484c06415f657ed8b53ce83a2f4e7c1 100644
(file)
--- 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;
}