Commit 59a88774 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'stefanha/net' into staging 



# By Jan Kiszka
# Via Stefan Hajnoczi
* stefanha/net:
  pcnet: Flush queued packets on end of STOP state

Message-id: 1375704975-19128-1-git-send-email-stefanha@redhat.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 56105bd5 ee76c1f8

hw/net/pcnet.c

+4 −0
Original line number Diff line number Diff line
@@ -861,6 +861,8 @@ static void pcnet_init(PCNetState *s) 


    s->csr[0] |= 0x0101;

    s->csr[0] &= ~0x0004;       /* clear STOP bit */



    qemu_flush_queued_packets(qemu_get_queue(s->nic));

}



static void pcnet_start(PCNetState *s)
@@ -878,6 +880,8 @@ static void pcnet_start(PCNetState *s) 
    s->csr[0] &= ~0x0004;       /* clear STOP bit */

    s->csr[0] |= 0x0002;

    pcnet_poll_timer(s);



    qemu_flush_queued_packets(qemu_get_queue(s->nic));

}



static void pcnet_stop(PCNetState *s)