aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdgar E. Iglesias <edgar.iglesias@xilinx.com>2018-11-23 14:54:50 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-11-26 13:41:42 +0000
commit58102ce7fbb2362aa53984aabcf684d164da2d9d (patch)
tree830b9086c58861d08881206b775ee755bdbfe929
parent49154ea0bfdefa17e03bf927db38b8501deb294f (diff)
downloadqemu-arm-58102ce7fbb2362aa53984aabcf684d164da2d9d.tar.gz
net: cadence_gem: Remove incorrect assert()pull-target-arm-20181126
Don't assert on RX descriptor settings when the receiver is disabled. This fixes an issue with incoming packets on an unused GEM. Reported-by: mbilal <muhammad_bilal@mentor.com> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 20181123135450.24829-2-edgar.iglesias@gmail.com Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--hw/net/cadence_gem.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index d95cc27f58..7f63411430 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -979,7 +979,6 @@ static ssize_t gem_receive(NetClientState *nc, const uint8_t *buf, size_t size)
/* Do nothing if receive is not enabled. */
if (!gem_can_receive(nc)) {
- assert(!first_desc);
return -1;
}