From: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Date: Fri, 23 Nov 2018 13:54:50 +0000 (+0100)
Subject: net: cadence_gem: Remove incorrect assert()
X-Git-Tag: v3.1.0-rc3~10^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58102ce7fbb2362aa53984aabcf684d164da2d9d;p=thirdparty%2Fqemu.git

net: cadence_gem: Remove incorrect assert()

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>
---

diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index d95cc27f583..7f63411430f 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;
         }