diff options
| author | Andrey Smirnov | 2018-01-11 14:25:36 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-01-11 14:25:36 +0100 |
| commit | 4c5e7a6cdae78ed823042375824ced09cccefbdb (patch) | |
| tree | 8cfe4ac61df723508fadd22ef19b2d1d061b4907 | |
| parent | imx_fec: Use ENET_FTRL to determine truncation length (diff) | |
| download | qemu-4c5e7a6cdae78ed823042375824ced09cccefbdb.tar.gz qemu-4c5e7a6cdae78ed823042375824ced09cccefbdb.tar.xz qemu-4c5e7a6cdae78ed823042375824ced09cccefbdb.zip | |
imx_fec: Use MIN instead of explicit ternary operator
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: qemu-devel@nongnu.org
Cc: qemu-arm@nongnu.org
Cc: yurovsky@gmail.com
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/net/imx_fec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index 50da91bf9e..6feda18742 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -1076,7 +1076,7 @@ static ssize_t imx_enet_receive(NetClientState *nc, const uint8_t *buf, TYPE_IMX_FEC, __func__); break; } - buf_len = (size <= s->regs[ENET_MRBR]) ? size : s->regs[ENET_MRBR]; + buf_len = MIN(size, s->regs[ENET_MRBR]); bd.length = buf_len; size -= buf_len; |