From: Peter Maydell Date: Wed, 9 Nov 2011 21:09:23 +0000 (+0000) Subject: hw/usb-net.c: Fix precedence bug when checking rndis_state X-Git-Tag: TizenStudio_2.0_p2.3~1956 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07fc8ddfd1a5b8a05572b261f888675acf0b2700;p=sdk%2Femulator%2Fqemu.git hw/usb-net.c: Fix precedence bug when checking rndis_state "!X == 2" is always false (spotted by Coverity), so the checks for whether rndis is in the correct state would never fire. Signed-off-by: Peter Maydell Signed-off-by: Andrzej Zaborowski --- diff --git a/hw/usb-net.c b/hw/usb-net.c index a8b7c8d..f91fa32 100644 --- a/hw/usb-net.c +++ b/hw/usb-net.c @@ -1268,8 +1268,9 @@ 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; @@ -1302,7 +1303,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; }