summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej Zaborowski <andrew.zaborowski@intel.com>2011-11-14 18:17:59 +0100
committerAndrzej Zaborowski <andrew.zaborowski@intel.com>2011-11-14 18:17:59 +0100
commit371572dff4d4dae128a03b30d623b7d212238a70 (patch)
treecb587c446e6858c8deeb7f0c0acdcf0b49fc5bbf
parenta3efecb847dd89886f7cd3f71661b2d79ec68072 (diff)
downloadqemu-371572dff4d4dae128a03b30d623b7d212238a70.tar.gz
Revert bugfix e7852674d5 until tested or until after the release.
Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
-rw-r--r--hw/usb-net.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/usb-net.c b/hw/usb-net.c
index f91fa32334..a8b7c8dd76 100644
--- a/hw/usb-net.c
+++ b/hw/usb-net.c
@@ -1268,9 +1268,8 @@ static ssize_t usbnet_receive(VLANClientState *nc, const uint8_t *buf, size_t si
if (is_rndis(s)) {
msg = (struct rndis_packet_msg_type *) s->in_buf;
- if (s->rndis_state != RNDIS_DATA_INITIALIZED) {
+ if (!s->rndis_state == RNDIS_DATA_INITIALIZED)
return -1;
- }
if (size + sizeof(struct rndis_packet_msg_type) > sizeof(s->in_buf))
return -1;
@@ -1303,7 +1302,7 @@ static int usbnet_can_receive(VLANClientState *nc)
{
USBNetState *s = DO_UPCAST(NICState, nc, nc)->opaque;
- if (is_rndis(s) && s->rndis_state != RNDIS_DATA_INITIALIZED) {
+ if (is_rndis(s) && !s->rndis_state == RNDIS_DATA_INITIALIZED) {
return 1;
}