Revision 4f1c942b hw/e1000.c
b/hw/e1000.c | ||
---|---|---|
599 | 599 |
return (s->mac_reg[RCTL] & E1000_RCTL_EN); |
600 | 600 |
} |
601 | 601 |
|
602 |
static void
|
|
602 |
static ssize_t
|
|
603 | 603 |
e1000_receive(VLANClientState *vc, const uint8_t *buf, size_t size) |
604 | 604 |
{ |
605 | 605 |
E1000State *s = vc->opaque; |
... | ... | |
611 | 611 |
uint8_t vlan_status = 0, vlan_offset = 0; |
612 | 612 |
|
613 | 613 |
if (!(s->mac_reg[RCTL] & E1000_RCTL_EN)) |
614 |
return; |
|
614 |
return -1;
|
|
615 | 615 |
|
616 | 616 |
if (size > s->rxbuf_size) { |
617 | 617 |
DBGOUT(RX, "packet too large for buffers (%lu > %d)\n", |
618 | 618 |
(unsigned long)size, s->rxbuf_size); |
619 |
return; |
|
619 |
return -1;
|
|
620 | 620 |
} |
621 | 621 |
|
622 | 622 |
if (!receive_filter(s, buf, size)) |
623 |
return; |
|
623 |
return size;
|
|
624 | 624 |
|
625 | 625 |
if (vlan_enabled(s) && is_vlan_packet(s, buf)) { |
626 | 626 |
vlan_special = cpu_to_le16(be16_to_cpup((uint16_t *)(buf + 14))); |
... | ... | |
635 | 635 |
do { |
636 | 636 |
if (s->mac_reg[RDH] == s->mac_reg[RDT] && s->check_rxov) { |
637 | 637 |
set_ics(s, 0, E1000_ICS_RXO); |
638 |
return; |
|
638 |
return -1;
|
|
639 | 639 |
} |
640 | 640 |
base = ((uint64_t)s->mac_reg[RDBAH] << 32) + s->mac_reg[RDBAL] + |
641 | 641 |
sizeof(desc) * s->mac_reg[RDH]; |
... | ... | |
659 | 659 |
DBGOUT(RXERR, "RDH wraparound @%x, RDT %x, RDLEN %x\n", |
660 | 660 |
rdh_start, s->mac_reg[RDT], s->mac_reg[RDLEN]); |
661 | 661 |
set_ics(s, 0, E1000_ICS_RXO); |
662 |
return; |
|
662 |
return -1;
|
|
663 | 663 |
} |
664 | 664 |
} while (desc.buffer_addr == 0); |
665 | 665 |
|
... | ... | |
677 | 677 |
n |= E1000_ICS_RXDMT0; |
678 | 678 |
|
679 | 679 |
set_ics(s, 0, n); |
680 |
|
|
681 |
return size; |
|
680 | 682 |
} |
681 | 683 |
|
682 | 684 |
static uint32_t |
Also available in: Unified diff