diff options
| author | Jason Wang <jasowang@redhat.com> | 2012-05-10 16:37:22 +0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-04 12:58:36 +0800 |
| commit | 9c92bf7f6c3f675e60b8ba8a5287bb88ea1eac36 (patch) | |
| tree | eab09e84f84f06b3b9c8653140875609ffeb6bd5 /hw | |
| parent | 74f4d2279b12a970d499558e4c38421724777827 (diff) | |
| download | qemu-9c92bf7f6c3f675e60b8ba8a5287bb88ea1eac36.zip qemu-9c92bf7f6c3f675e60b8ba8a5287bb88ea1eac36.tar.gz qemu-9c92bf7f6c3f675e60b8ba8a5287bb88ea1eac36.tar.bz2 | |
Revert "rtl8139: do the network/host communication only in normal operating mode"
This reverts commit ff71f2e8cacefae99179993204172bc65e4303df. This is because
the linux 8139cp driver would leave the card in "Config Register Write Enable"
mode after the eeprom were read or write ( which is unexpected in the spec
). Also a physical 8139 card can still DMA into host memory in modes other than
Normal mode, so we need revert this commit to align with the behavior of
physical card.
The issue of 8139cp driver should be fixed in linux seperately.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/rtl8139.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/hw/rtl8139.c b/hw/rtl8139.c index eb22d04..2413bc3 100644 --- a/hw/rtl8139.c +++ b/hw/rtl8139.c @@ -791,9 +791,6 @@ static int rtl8139_can_receive(VLANClientState *nc) return 1; if (!rtl8139_receiver_enabled(s)) return 1; - /* network/host communication happens only in normal mode */ - if ((s->Cfg9346 & Chip9346_op_mask) != Cfg9346_Normal) - return 0; if (rtl8139_cp_receiver_enabled(s)) { /* ??? Flow control not implemented in c+ mode. @@ -836,12 +833,6 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_ return -1; } - /* check whether we are in normal mode */ - if ((s->Cfg9346 & Chip9346_op_mask) != Cfg9346_Normal) { - DPRINTF("not in normal op mode\n"); - return -1; - } - /* XXX: check this */ if (s->RxConfig & AcceptAllPhys) { /* promiscuous: receive all */ |