diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-25 17:49:45 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-25 17:49:46 +0000 |
| commit | 169e4878ee96b7d6dec929e0cd400a0395865a85 (patch) | |
| tree | 305698cc0f5b698a5f66e1a28a7dbf8064a94b94 | |
| parent | d4cc1a213f8cb22fa0861ae2a907c60cf00796ff (diff) | |
| parent | 131e744a15c54f0bad3d3925eeca1acf47996e06 (diff) | |
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: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | net/netmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netmap.c b/net/netmap.c index 8213304a5b..0c1772b03f 100644 --- a/net/netmap.c +++ b/net/netmap.c @@ -177,8 +177,8 @@ 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->read_poll = enable; + s->write_poll = enable; + s->read_poll = enable; netmap_update_fd_handler(s); } } |