[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/18] sunhme: switch sunhme over to use net_crc32_le
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 07/18] sunhme: switch sunhme over to use net_crc32_le() |
Date: |
Fri, 22 Dec 2017 10:15:26 +0800 |
From: Mark Cave-Ayland <address@hidden>
Instead of sunhme_crc32_le() using its own implementation, we can simply call
net_crc32_le() directly and apply the bit shift inline.
Signed-off-by: Mark Cave-Ayland <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
hw/net/sunhme.c | 25 +------------------------
1 file changed, 1 insertion(+), 24 deletions(-)
diff --git a/hw/net/sunhme.c b/hw/net/sunhme.c
index b1efa1b..7558fca 100644
--- a/hw/net/sunhme.c
+++ b/hw/net/sunhme.c
@@ -698,29 +698,6 @@ static inline void sunhme_set_rx_ring_nr(SunHMEState *s,
int i)
s->erxregs[HME_ERXI_RING >> 2] = ring;
}
-#define POLYNOMIAL_LE 0xedb88320
-static uint32_t sunhme_crc32_le(const uint8_t *p, int len)
-{
- uint32_t crc;
- int carry, i, j;
- uint8_t b;
-
- crc = 0xffffffff;
- for (i = 0; i < len; i++) {
- b = *p++;
- for (j = 0; j < 8; j++) {
- carry = (crc & 0x1) ^ (b & 0x01);
- crc >>= 1;
- b >>= 1;
- if (carry) {
- crc = crc ^ POLYNOMIAL_LE;
- }
- }
- }
-
- return crc;
-}
-
#define MIN_BUF_SIZE 60
static ssize_t sunhme_receive(NetClientState *nc, const uint8_t *buf,
@@ -761,7 +738,7 @@ static ssize_t sunhme_receive(NetClientState *nc, const
uint8_t *buf,
trace_sunhme_rx_filter_bcast_match();
} else if (s->macregs[HME_MACI_RXCFG >> 2] & HME_MAC_RXCFG_HENABLE) {
/* Didn't match local address, check hash filter */
- int mcast_idx = sunhme_crc32_le(buf, 6) >> 26;
+ int mcast_idx = net_crc32_le(buf, ETH_ALEN) >> 26;
if (!(s->macregs[(HME_MACI_HASHTAB0 >> 2) - (mcast_idx >> 4)] &
(1 << (mcast_idx & 0xf)))) {
/* Didn't match hash filter */
--
2.7.4
- [Qemu-devel] [PULL 00/18] Net patches, Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 01/18] e1000, e1000e: Move per-packet TX offload flags out of context state, Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 02/18] e1000: Separate TSO and non-TSO contexts, fixing UDP TX corruption, Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 03/18] net: move CRC32 calculation from compute_mcast_idx() into its own net_crc32() function, Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 04/18] net: introduce net_crc32_le() function, Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 05/18] pcnet: switch pcnet over to use net_crc32_le(), Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 06/18] eepro100: switch eepro100 e100_compute_mcast_idx() over to use net_crc32(), Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 07/18] sunhme: switch sunhme over to use net_crc32_le(),
Jason Wang <=
- [Qemu-devel] [PULL 08/18] sungem: fix multicast filter CRC calculation, Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 09/18] eepro100: use inline net_crc32() and bitshift instead of compute_mcast_idx(), Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 10/18] opencores_eth: use inline net_crc32() and bitshift instead of compute_mcast_idx(), Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 11/18] lan9118: use inline net_crc32() and bitshift instead of compute_mcast_idx(), Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 12/18] ftgmac100: use inline net_crc32() and bitshift instead of compute_mcast_idx(), Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 13/18] ne2000: use inline net_crc32() and bitshift instead of compute_mcast_idx(), Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 14/18] rtl8139: use inline net_crc32() and bitshift instead of compute_mcast_idx(), Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 15/18] net: remove unused compute_mcast_idx() function, Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 16/18] net: Remove the legacy "-net channel" parameter, Jason Wang, 2017/12/21
- [Qemu-devel] [PULL 17/18] qemu-doc: The "-net nic" option can be used with "netdev=...", too, Jason Wang, 2017/12/21