OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Net patches 

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJTMZqYAAoJEJykq7OBq3PIP+4H/1g2t94pXAsDj8us4Fr9fL2B
 yA0h/e/eoDo8U640Rck10+Bh9nPPALQj1ydBQp0RhazFqTTmzIWoOSDm5NLvnFAH
 VjVjFM+qZpWpNIy/v+xGBmW5NtNVieYk/xtIUxw0lV+mDqGV1xASkYksu2pwoH0w
 /lqmjK5UuM/FRUgsrie06MfTFlGiow9Lg/9RYClVB6s2mSH/metPAu51GtuXWKyS
 6m/41V0Fp82ggaXVGVd8espUIJQ9DPSj8WoZvdjkpOC3msFieywKUkY59qBvG8zX
 5DBFw90av13+83HAH7/DdTCh5cKPD5ktH9ZQcRkxTZ4b9npo4RTididPS3GoVgw=
 =vltp
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2014-03-25 17:49:45 +00:00
parent d4cc1a213f 131e744a15
commit 169e4878ee
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/netmap.c
View File

@ -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);
}
}