Commit 169e4878 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into staging 



Net patches

# gpg: Signature made Tue 25 Mar 2014 15:02:48 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8

* remotes/stefanha/tags/net-pull-request:
  net: netmap_poll must update both read/write poll state

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d4cc1a21 131e744a

net/netmap.c

+2 −2
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static void netmap_poll(NetClientState *nc, bool enable) 
    NetmapState *s = DO_UPCAST(NetmapState, nc, nc);



    if (s->read_poll != enable || s->write_poll != enable) {

        s->read_poll = enable;

        s->write_poll = enable;

        s->read_poll  = enable;

        netmap_update_fd_handler(s);

    }