From patchwork Tue Mar 16 08:12:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1453751 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=S1A7Bk2Y; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F05n00Pq2z9sSC for ; Tue, 16 Mar 2021 19:19:48 +1100 (AEDT) Received: from localhost ([::1]:34274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lM4va-0004Cf-1z for incoming@patchwork.ozlabs.org; Tue, 16 Mar 2021 04:19:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lM4pk-0002dl-Q6 for qemu-devel@nongnu.org; Tue, 16 Mar 2021 04:13:46 -0400 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]:39898) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lM4ph-0007yu-Py for qemu-devel@nongnu.org; Tue, 16 Mar 2021 04:13:44 -0400 Received: by mail-ed1-x52f.google.com with SMTP id bf3so20364592edb.6 for ; Tue, 16 Mar 2021 01:13:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=gFyCn7AAnq6rtrT5DhQ5aWP+2dV02IyJ8TpsxTaNTQs=; b=S1A7Bk2Y3BsukEMI7Rw7m0+LFk9sX3BGnpPTC8MP47XxWiFM9wi4soTi9OVkhOzuNk geh7Fcw3KGO66zvGK3SsUlJOCj5vT/UaNMCK9iY1jXcPHwias/nYtDj6uSf/z8W+Mrvj MsxhG6TXYifGz3o3nGOTaWytBIJ/7uJfwplcRun3w8v1HHQeldifpLQqAoxnS/nYOUvo mipoqZlkzdubG6HzY4r8+Bo2cSTgRbd2dJMHEpPqvW9kmOJMb7DxDS8P9Z5dXRTEspK0 0DfEg2drpmOyQkVBg+k404iegIGPGHK261ugeS7VV6FYGnsVe/zF6JYJlR3wiyV/safK KLLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=gFyCn7AAnq6rtrT5DhQ5aWP+2dV02IyJ8TpsxTaNTQs=; b=cyo0skVsHf0jRzLxrFyJHvdWbzM8ZcWJ+xC8uEHhXQE6UwQ9jT2pzCYZd1s7tRiEaw DzWsJ3F/0irmb9irdOUcjQzobHV1w1eMhy2bz2ZvRXtB1DRrPKyO9Twt5FzyRr6Xnkaf 2SKWtWlChip1c04WdEbmVq5t4PoVXPHhno/BnlB6+FfVTj/Vdoa9XgHIjYr2S5aqNF/E ySk6upvo60ecv7VzlwLf/dsk/e27lrzQ/Qqm5czxzlyMSlA0u3T3cd/HwferPdsdrMf4 +4rxHeYCAH1QPI9Yg19if8iT7M3HIAPLN86WcLsAKR22CLlRxXaav8GLTTkJgyfNdwdh oMdg== X-Gm-Message-State: AOAM531COoQPgyuwi6JUtQa7eBvqfvmgtKqgyhD6/KXZTWT9AABjOMGf keOm+SvSrdVaWI6Dd3oEc0Pjq1ekMYM= X-Google-Smtp-Source: ABdhPJwwQigPCUtcoRuN73hmOMIVrYwVZc+JUELmKAgtL5hBY74pbBJvgnfNIfusHxkvSVgwsda+GA== X-Received: by 2002:a05:6402:8c2:: with SMTP id d2mr35228060edz.4.1615882420569; Tue, 16 Mar 2021 01:13:40 -0700 (PDT) Received: from pek-vx-bsp9.wrs.com (ec2-44-242-66-180.us-west-2.compute.amazonaws.com. [44.242.66.180]) by smtp.gmail.com with ESMTPSA id a17sm5620333ejf.20.2021.03.16.01.13.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Mar 2021 01:13:40 -0700 (PDT) From: Bin Meng To: Jason Wang , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , qemu-devel@nongnu.org Subject: [PATCH v3 10/13] hw/net: pcnet: Remove the logic of padding short frames in the receive path Date: Tue, 16 Mar 2021 16:12:51 +0800 Message-Id: <20210316081254.72684-11-bmeng.cn@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210316081254.72684-1-bmeng.cn@gmail.com> References: <20210316081254.72684-1-bmeng.cn@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=bmeng.cn@gmail.com; helo=mail-ed1-x52f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Now that we have implemented unified short frames padding in the QEMU networking codes, remove the same logic in the NIC codes. Signed-off-by: Bin Meng --- (no changes since v1) hw/net/pcnet.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c index f3f18d8598..16330335cd 100644 --- a/hw/net/pcnet.c +++ b/hw/net/pcnet.c @@ -987,7 +987,6 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_) { PCNetState *s = qemu_get_nic_opaque(nc); int is_padr = 0, is_bcast = 0, is_ladr = 0; - uint8_t buf1[60]; int remaining; int crc_err = 0; size_t size = size_; @@ -1000,14 +999,6 @@ ssize_t pcnet_receive(NetClientState *nc, const uint8_t *buf, size_t size_) printf("pcnet_receive size=%zu\n", size); #endif - /* if too small buffer, then expand it */ - if (size < MIN_BUF_SIZE) { - memcpy(buf1, buf, size); - memset(buf1 + size, 0, MIN_BUF_SIZE - size); - buf = buf1; - size = MIN_BUF_SIZE; - } - if (CSR_PROM(s) || (is_padr=padr_match(s, buf, size)) || (is_bcast=padr_bcast(s, buf, size))