sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Peter Maydell 2011-11-09 21:09:23 +00:00 committed by Andrzej Zaborowski
parent 88365e47dd
commit e7852674d5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/usb-net.c
View File

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