mirror of https://github.com/proxmox/mirror_qemu
Revert "Revert "rtl8139: do the network/host communication only in normal operating mode""
This reverts commit 9c92bf7f6c
.
Per Jason's request.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
master
parent
8cc9b43f7c
commit
721589dd74
|
@ -791,6 +791,9 @@ static int rtl8139_can_receive(VLANClientState *nc)
|
||||||
return 1;
|
return 1;
|
||||||
if (!rtl8139_receiver_enabled(s))
|
if (!rtl8139_receiver_enabled(s))
|
||||||
return 1;
|
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)) {
|
if (rtl8139_cp_receiver_enabled(s)) {
|
||||||
/* ??? Flow control not implemented in c+ mode.
|
/* ??? Flow control not implemented in c+ mode.
|
||||||
|
@ -833,6 +836,12 @@ static ssize_t rtl8139_do_receive(VLANClientState *nc, const uint8_t *buf, size_
|
||||||
return -1;
|
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 */
|
/* XXX: check this */
|
||||||
if (s->RxConfig & AcceptAllPhys) {
|
if (s->RxConfig & AcceptAllPhys) {
|
||||||
/* promiscuous: receive all */
|
/* promiscuous: receive all */
|
||||||
|
|
Loading…
Reference in New Issue