| Message ID | 4F1EA87C.7090708@siemens.com |
|---|---|
| State | New |
| Headers | show |
On 2012-01-24 13:47, Jan Kiszka wrote: > A device reset does not affect the link state, only set_link does. > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > --- > hw/pcnet.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/hw/pcnet.c b/hw/pcnet.c > index 306dc6e..6aa48e0 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; > } Also rather trivial. Jan
On Tue, Jan 24, 2012 at 01:47:56PM +0100, Jan Kiszka wrote: > A device reset does not affect the link state, only set_link does. > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > --- > hw/pcnet.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) Thanks, applied to the trivial patches tree: https://github.com/stefanha/qemu/commits/trivial-patches Stefan
diff --git a/hw/pcnet.c b/hw/pcnet.c index 306dc6e..6aa48e0 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; }
A device reset does not affect the link state, only set_link does. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> --- hw/pcnet.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)