diff options
author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-08-06 14:11:44 +0000 |
---|---|---|
committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-08-06 14:11:44 +0000 |
commit | 4105de6732f771ea64113851a2ee7172c34d3a7a (patch) | |
tree | 7402934d63b4d0b1dd918cf92da2ab5d6f98a242 /hw/e1000.c | |
parent | 2137b4cca9af2ca22b527ef9f3835c532511453d (diff) |
only check RCTL_EN in e1000_can_receive()
e1000_receive() has code to raise a receive overflow interrupt when the receive
buffer head and tail match. However, with the present implementation of
e1000_can_receive(), this code is unreachable -- and etherboot breaks as a
result.
Signed-off-by: Charles Duffy <charles_duffy@messageone.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4987 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/e1000.c')
-rw-r--r-- | hw/e1000.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/e1000.c b/hw/e1000.c index d81d9bea29..d52f1f03b1 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -524,8 +524,7 @@ e1000_can_receive(void *opaque) { E1000State *s = opaque; - return (!(s->mac_reg[RCTL] & E1000_RCTL_EN) || - s->mac_reg[RDH] != s->mac_reg[RDT]); + return (s->mac_reg[RCTL] & E1000_RCTL_EN); } static void |