From 4105de6732f771ea64113851a2ee7172c34d3a7a Mon Sep 17 00:00:00 2001 From: aliguori Date: Wed, 6 Aug 2008 14:11:44 +0000 Subject: [PATCH] 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 Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4987 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/e1000.c | 3 +-- 1 file changed, 1 insertion(+), 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 -- 2.11.0