gwj / at91sam9263 · Commits

Commit 4105de6732f771ea64113851a2ee7172c34d3a7a

Authored by aliguori
1 parent 2137b4cc

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
Inline Side-by-side
Showing 1 changed file with 1 additions and 2 deletions
hw/e1000.c
  View file @4105de6
... ... @@ -524,8 +524,7 @@ e1000_can_receive(void *opaque)
524 524 {
525 525 E1000State *s = opaque;
526 526  
527   - return (!(s->mac_reg[RCTL] & E1000_RCTL_EN) ||
528   - s->mac_reg[RDH] != s->mac_reg[RDT]);
  527 + return (s->mac_reg[RCTL] & E1000_RCTL_EN);
529 528 }
530 529  
531 530 static void
... ...