From nobody Wed Feb 11 03:43:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1512462005064107.12702365518271; Tue, 5 Dec 2017 00:20:05 -0800 (PST) Received: from localhost ([::1]:47130 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eM8SC-0005LN-3a for importer@patchew.org; Tue, 05 Dec 2017 03:19:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eM8QS-0004SU-8d for qemu-devel@nongnu.org; Tue, 05 Dec 2017 03:18:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eM8QR-0006tO-At for qemu-devel@nongnu.org; Tue, 05 Dec 2017 03:18:00 -0500 Received: from chuckie.co.uk ([82.165.15.123]:38189 helo=s16892447.onlinehome-server.info) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eM8QR-0006sw-4C for qemu-devel@nongnu.org; Tue, 05 Dec 2017 03:17:59 -0500 Received: from host109-155-37-222.range109-155.btcentralplus.com ([109.155.37.222] helo=kentang.home) by s16892447.onlinehome-server.info with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1eM8QV-0005WJ-Rr; Tue, 05 Dec 2017 08:18:05 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, jasowang@redhat.com, sw@weilnetz.de Date: Tue, 5 Dec 2017 08:17:40 +0000 Message-Id: <20171205081744.6563-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171205081744.6563-1-mark.cave-ayland@ilande.co.uk> References: <20171205081744.6563-1-mark.cave-ayland@ilande.co.uk> X-SA-Exim-Connect-IP: 109.155.37.222 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk X-SA-Exim-Version: 4.2.1 (built Sun, 08 Jan 2012 02:45:44 +0000) X-SA-Exim-Scanned: Yes (on s16892447.onlinehome-server.info) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 82.165.15.123 Subject: [Qemu-devel] [PATCHv2 1/5] net: move CRC32 calculation from compute_mcast_idx() into its own net_crc32() function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Separate out the standard ethernet CRC32 calculation into a new net_crc32() function, renaming the constant POLYNOMIAL to POLYNOMIAL_BE to make it clear that this is a big-endian CRC32 calculation. Then remove the existing implementation from compute_mcast_idx() and call t= he new function in its place. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/net/net.h | 3 ++- net/net.c | 16 +++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/include/net/net.h b/include/net/net.h index 1c55a93588..586098cb94 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -227,7 +227,8 @@ NetClientState *net_hub_port_find(int hub_id); =20 void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd); =20 -#define POLYNOMIAL 0x04c11db6 +#define POLYNOMIAL_BE 0x04c11db6 +uint32_t net_crc32(const uint8_t *p, int len); unsigned compute_mcast_idx(const uint8_t *ep); =20 #define vmstate_offset_macaddr(_state, _field) \ diff --git a/net/net.c b/net/net.c index 39ef546708..02a567c18f 100644 --- a/net/net.c +++ b/net/net.c @@ -1581,25 +1581,31 @@ int net_client_parse(QemuOptsList *opts_list, const= char *optarg) =20 /* From FreeBSD */ /* XXX: optimize */ -unsigned compute_mcast_idx(const uint8_t *ep) +uint32_t net_crc32(const uint8_t *p, int len) { uint32_t crc; int carry, i, j; uint8_t b; =20 crc =3D 0xffffffff; - for (i =3D 0; i < 6; i++) { - b =3D *ep++; + for (i =3D 0; i < len; i++) { + b =3D *p++; for (j =3D 0; j < 8; j++) { carry =3D ((crc & 0x80000000L) ? 1 : 0) ^ (b & 0x01); crc <<=3D 1; b >>=3D 1; if (carry) { - crc =3D ((crc ^ POLYNOMIAL) | carry); + crc =3D ((crc ^ POLYNOMIAL_BE) | carry); } } } - return crc >> 26; + + return crc; +} + +unsigned compute_mcast_idx(const uint8_t *ep) +{ + return net_crc32(ep, 6) >> 26; } =20 QemuOptsList qemu_netdev_opts =3D { --=20 2.11.0