From patchwork Tue Jul 8 17:16:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 33353 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f72.google.com (mail-qg0-f72.google.com [209.85.192.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 66E80203F4 for ; Wed, 9 Jul 2014 23:46:06 +0000 (UTC) Received: by mail-qg0-f72.google.com with SMTP id q107sf18725499qgd.11 for ; Wed, 09 Jul 2014 16:46:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=2H8RiJryu+x+/Pd2Jx0CXaTG9Yi7tYLNuFZV69Y3QpU=; b=KqhpUvGXZTBvIdU1Q9iNjyfwTkCKzU056lYxpFHtt6zUq/CHue8GtfJuU+mK/Kpw1U x2+TdQrilWZI85dX0sh5tIsKIpAiwkxtsa222QXOmcTBdJ3FAYlywzJuHLc7a3pHWXd2 71GYkw6pfaVgwosci5d6qt/U+1JH/exx3oaIWw043gJsh/GY1t6pYiPgOQK4G+47FRcQ s30A0yLSq1jmpqeezd1s3/OCzfXLLcOaH+YuIHejTzJgbZajI8zGaMw1p3aNshMPdLHU Ds+9LoeV4ZSEecdZitSabqhO+BFfFab8r/6/ZhGhjVOZfZPxMB9s1K4P8LAJICivrmW0 UncQ== X-Gm-Message-State: ALoCoQm5bE9bDYTHDexRZlUbJiZyq3gK5fU/JTeLJbAg1GwJ8Su+mbQ+sU4jO6MYJiPbWgek37QX X-Received: by 10.236.63.197 with SMTP id a45mr7623969yhd.9.1404949566209; Wed, 09 Jul 2014 16:46:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.19.173 with SMTP id 42ls2753348qgh.27.gmail; Wed, 09 Jul 2014 16:46:06 -0700 (PDT) X-Received: by 10.52.166.10 with SMTP id zc10mr814012vdb.61.1404949566080; Wed, 09 Jul 2014 16:46:06 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id ai5si5636388vdc.32.2014.07.09.16.46.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Jul 2014 16:46:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id ij19so8996812vcb.37 for ; Wed, 09 Jul 2014 16:46:06 -0700 (PDT) X-Received: by 10.221.25.210 with SMTP id rj18mr41958865vcb.5.1404949565976; Wed, 09 Jul 2014 16:46:05 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp86542vcb; Wed, 9 Jul 2014 16:46:05 -0700 (PDT) X-Received: by 10.224.13.4 with SMTP id z4mr70504741qaz.51.1404949565604; Wed, 09 Jul 2014 16:46:05 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x64si30300103qgx.80.2014.07.09.16.46.05 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 09 Jul 2014 16:46:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:34522 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X51Yr-0003sW-9c for patch@linaro.org; Wed, 09 Jul 2014 19:46:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39157) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4Z44-00038M-Es for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:20:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4Z3q-0007NR-VH for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:20:24 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:43513) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4Z3q-0007Mz-QI for qemu-devel@nongnu.org; Tue, 08 Jul 2014 13:20:10 -0400 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 8 Jul 2014 13:20:10 -0400 Received: from d01dlp02.pok.ibm.com (9.56.250.167) by e9.ny.us.ibm.com (192.168.1.109) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 8 Jul 2014 13:20:07 -0400 Received: from b01cxnp23034.gho.pok.ibm.com (b01cxnp23034.gho.pok.ibm.com [9.57.198.29]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id A13466E8041; Tue, 8 Jul 2014 13:19:57 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by b01cxnp23034.gho.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s68HK7BS65405148; Tue, 8 Jul 2014 17:20:07 GMT Received: from d01av03.pok.ibm.com (localhost [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s68HK6EE026934; Tue, 8 Jul 2014 13:20:06 -0400 Received: from localhost ([9.41.105.211]) by d01av03.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s68HK69h026915; Tue, 8 Jul 2014 13:20:06 -0400 From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 8 Jul 2014 12:16:47 -0500 Message-Id: <1404839947-1086-17-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1404839947-1086-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1404839947-1086-1-git-send-email-mdroth@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14070817-7182-0000-0000-00000B126F02 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.182.139 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 016/156] hw/net/stellaris_enet: Correct handling of packet padding X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: mdroth@linux.vnet.ibm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Peter Maydell The PADEN bit in the transmit control register enables padding of short data packets out to the required minimum length. However a typo here meant we were adjusting tx_fifo_len rather than tx_frame_len, so the padding didn't actually happen. Fix this bug. Signed-off-by: Peter Maydell Reviewed-by: Dr. David Alan Gilbert Cc: qemu-stable@nongnu.org (cherry picked from commit 7fd5f064d1c1a827a95ffe678418b3d5b8d2f108) Signed-off-by: Michael Roth --- hw/net/stellaris_enet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/net/stellaris_enet.c b/hw/net/stellaris_enet.c index 8a1d0d1..376c7b0 100644 --- a/hw/net/stellaris_enet.c +++ b/hw/net/stellaris_enet.c @@ -264,7 +264,7 @@ static void stellaris_enet_write(void *opaque, hwaddr offset, s->tx_frame_len -= 4; if ((s->tctl & SE_TCTL_PADEN) && s->tx_frame_len < 60) { memset(&s->tx_fifo[s->tx_frame_len], 0, 60 - s->tx_frame_len); - s->tx_fifo_len = 60; + s->tx_frame_len = 60; } qemu_send_packet(qemu_get_queue(s->nic), s->tx_fifo, s->tx_frame_len);