[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/13] hw/net/rtl8139: Simplify if/else statement
From: |
Jason Wang |
Subject: |
[PULL 06/13] hw/net/rtl8139: Simplify if/else statement |
Date: |
Fri, 27 Mar 2020 19:14:00 +0800 |
From: Philippe Mathieu-Daudé <address@hidden>
Rewrite:
if (E) {
return A;
} else {
return B;
}
/* EOF */
}
as:
if (E) {
return A;
}
return B;
}
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Reviewed-by: Cédric Le Goater <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/rtl8139.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c
index ae4739b..ef32115 100644
--- a/hw/net/rtl8139.c
+++ b/hw/net/rtl8139.c
@@ -808,11 +808,11 @@ static int rtl8139_can_receive(NetClientState *nc)
/* ??? Flow control not implemented in c+ mode.
This is a hack to work around slirp deficiencies anyway. */
return 1;
- } else {
- avail = MOD2(s->RxBufferSize + s->RxBufPtr - s->RxBufAddr,
- s->RxBufferSize);
- return (avail == 0 || avail >= 1514 || (s->IntrMask & RxOverflow));
}
+
+ avail = MOD2(s->RxBufferSize + s->RxBufPtr - s->RxBufAddr,
+ s->RxBufferSize);
+ return avail == 0 || avail >= 1514 || (s->IntrMask & RxOverflow);
}
static ssize_t rtl8139_do_receive(NetClientState *nc, const uint8_t *buf,
size_t size_, int do_interrupt)
--
2.5.0
- [PULL 00/13] Net patches, Jason Wang, 2020/03/27
- [PULL 01/13] hw/net/i82596: Correct command bitmask (CID 1419392), Jason Wang, 2020/03/27
- [PULL 02/13] hw/net/i82596.c: Avoid reading off end of buffer in i82596_receive(), Jason Wang, 2020/03/27
- [PULL 03/13] Fixed integer overflow in e1000e, Jason Wang, 2020/03/27
- [PULL 04/13] hw/net/e1000e_core: Let e1000e_can_receive() return a boolean, Jason Wang, 2020/03/27
- [PULL 05/13] hw/net/smc91c111: Let smc91c111_can_receive() return a boolean, Jason Wang, 2020/03/27
- [PULL 06/13] hw/net/rtl8139: Simplify if/else statement,
Jason Wang <=
- [PULL 07/13] hw/net/rtl8139: Update coding style to make checkpatch.pl happy, Jason Wang, 2020/03/27
- [PULL 08/13] hw/net: Make NetCanReceive() return a boolean, Jason Wang, 2020/03/27
- [PULL 09/13] hw/net/can: Make CanBusClientInfo::can_receive() return a boolean, Jason Wang, 2020/03/27
- [PULL 10/13] net/colo-compare.c: Expose "compare_timeout" to users, Jason Wang, 2020/03/27
- [PULL 11/13] net/colo-compare.c: Expose "expired_scan_cycle" to users, Jason Wang, 2020/03/27
- [PULL 12/13] net: tulip: check frame size and r/w data length, Jason Wang, 2020/03/27
- [PULL 13/13] hw/net/allwinner-sun8i-emac.c: Fix REG_ADDR_HIGH/LOW reads, Jason Wang, 2020/03/27
- Re: [PULL 00/13] Net patches, Peter Maydell, 2020/03/27
- Re: [PULL 00/13] Net patches, no-reply, 2020/03/27