aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2011-11-09 21:09:23 +0000
committerAndrzej Zaborowski <andrew.zaborowski@intel.com>2011-11-14 02:19:24 +0100
commite7852674d5013bffd0bb8e822a7521f76677a60b (patch)
treec4ce2220ca9639e315874485ddf2ee69da0e2c1d
parent88365e47dd19da8776252a94ed5fa0b7242ea9e9 (diff)
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 <peter.maydell@linaro.org> Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
-rw-r--r--hw/usb-net.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/usb-net.c b/hw/usb-net.c
index a8b7c8dd76..f91fa32334 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;
}