From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org, qemu-devel@nongnu.org
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>,
Jason Wang <jasowang@redhat.com>
Subject: [Qemu-devel] [PULL 08/18] sungem: fix multicast filter CRC calculation
Date: Fri, 22 Dec 2017 10:15:27 +0800 [thread overview]
Message-ID: <1513908937-16034-9-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1513908937-16034-1-git-send-email-jasowang@redhat.com>
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
>From the Linux sungem driver, we know that the multicast filter CRC is
implemented using ether_crc_le() which isn't the same as calling zlib's
crc32() function (the zlib implementation requires a complemented initial value
and also returns the complemented result).
Fix the multicast filter by simply using the new net_crc32_le() function.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/sungem.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/net/sungem.c b/hw/net/sungem.c
index 6aa8d11..60f1e47 100644
--- a/hw/net/sungem.c
+++ b/hw/net/sungem.c
@@ -11,12 +11,11 @@
#include "hw/pci/pci.h"
#include "qemu/log.h"
#include "net/net.h"
+#include "net/eth.h"
#include "net/checksum.h"
#include "hw/net/mii.h"
#include "sysemu/sysemu.h"
#include "trace.h"
-/* For crc32 */
-#include <zlib.h>
#define TYPE_SUNGEM "sungem"
@@ -595,7 +594,7 @@ static ssize_t sungem_receive(NetClientState *nc, const uint8_t *buf,
}
/* Get MAC crc */
- mac_crc = crc32(~0, buf, 6);
+ mac_crc = net_crc32_le(buf, ETH_ALEN);
/* Packet isn't for me ? */
rx_cond = sungem_check_rx_mac(s, buf, mac_crc);
--
2.7.4
next prev parent reply other threads:[~2017-12-22 2:16 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-22 2:15 [Qemu-devel] [PULL 00/18] Net patches Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 01/18] e1000, e1000e: Move per-packet TX offload flags out of context state Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 02/18] e1000: Separate TSO and non-TSO contexts, fixing UDP TX corruption Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 03/18] net: move CRC32 calculation from compute_mcast_idx() into its own net_crc32() function Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 04/18] net: introduce net_crc32_le() function Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 05/18] pcnet: switch pcnet over to use net_crc32_le() Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 06/18] eepro100: switch eepro100 e100_compute_mcast_idx() over to use net_crc32() Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 07/18] sunhme: switch sunhme over to use net_crc32_le() Jason Wang
2017-12-22 2:15 ` Jason Wang [this message]
2017-12-22 2:15 ` [Qemu-devel] [PULL 09/18] eepro100: use inline net_crc32() and bitshift instead of compute_mcast_idx() Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 10/18] opencores_eth: " Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 11/18] lan9118: " Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 12/18] ftgmac100: " Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 13/18] ne2000: " Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 14/18] rtl8139: " Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 15/18] net: remove unused compute_mcast_idx() function Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 16/18] net: Remove the legacy "-net channel" parameter Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 17/18] qemu-doc: The "-net nic" option can be used with "netdev=...", too Jason Wang
2017-12-22 2:15 ` [Qemu-devel] [PULL 18/18] qemu-doc: Update the deprecation information of -tftp, -bootp, -redir and -smb Jason Wang
2018-01-08 10:16 ` [Qemu-devel] [PULL 00/18] Net patches Peter Maydell
2018-01-08 13:30 ` Ed Swierk
2018-01-08 15:10 ` Eric Blake
2018-01-08 15:18 ` Eric Blake
2018-01-08 15:25 ` Eric Blake
2018-01-08 15:54 ` Ed Swierk
2018-01-08 16:33 ` Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1513908937-16034-9-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).