[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv3 03/13] pcnet: switch pcnet over to use net_crc32_l
From: |
Mark Cave-Ayland |
Subject: |
[Qemu-devel] [PATCHv3 03/13] pcnet: switch pcnet over to use net_crc32_le() |
Date: |
Fri, 15 Dec 2017 18:41:45 +0000 |
Instead of lnc_mchash() 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>
---
hw/net/pcnet.c | 22 ++--------------------
1 file changed, 2 insertions(+), 20 deletions(-)
diff --git a/hw/net/pcnet.c b/hw/net/pcnet.c
index 654455355f..39d5d93525 100644
--- a/hw/net/pcnet.c
+++ b/hw/net/pcnet.c
@@ -38,6 +38,7 @@
#include "qemu/osdep.h"
#include "hw/qdev.h"
#include "net/net.h"
+#include "net/eth.h"
#include "qemu/timer.h"
#include "qemu/sockets.h"
#include "sysemu/sysemu.h"
@@ -522,25 +523,6 @@ static inline void pcnet_rmd_store(PCNetState *s, struct
pcnet_RMD *rmd,
be16_to_cpu(hdr->ether_type)); \
} while (0)
-#define MULTICAST_FILTER_LEN 8
-
-static inline uint32_t lnc_mchash(const uint8_t *ether_addr)
-{
-#define LNC_POLYNOMIAL 0xEDB88320UL
- uint32_t crc = 0xFFFFFFFF;
- int idx, bit;
- uint8_t data;
-
- for (idx = 0; idx < 6; idx++) {
- for (data = *ether_addr++, bit = 0; bit < MULTICAST_FILTER_LEN; bit++)
{
- crc = (crc >> 1) ^ (((crc ^ data) & 1) ? LNC_POLYNOMIAL : 0);
- data >>= 1;
- }
- }
- return crc;
-#undef LNC_POLYNOMIAL
-}
-
#define CRC(crc, ch) (crc = (crc >> 8) ^ crctab[(crc ^ (ch)) & 0xff])
/* generated using the AUTODIN II polynomial
@@ -656,7 +638,7 @@ static inline int ladr_match(PCNetState *s, const uint8_t
*buf, int size)
s->csr[10] & 0xff, s->csr[10] >> 8,
s->csr[11] & 0xff, s->csr[11] >> 8
};
- int index = lnc_mchash(hdr->ether_dhost) >> 26;
+ int index = net_crc32_le(hdr->ether_dhost, ETH_ALEN) >> 26;
return !!(ladr[index >> 3] & (1 << (index & 7)));
}
return 0;
--
2.11.0
- [Qemu-devel] [PATCHv3 00/13] net: introduce common net_crc32() and net_crc32_le() functions, Mark Cave-Ayland, 2017/12/15
- [Qemu-devel] [PATCHv3 06/13] sungem: fix multicast filter CRC calculation, Mark Cave-Ayland, 2017/12/15
- [Qemu-devel] [PATCHv3 02/13] net: introduce net_crc32_le() function, Mark Cave-Ayland, 2017/12/15
- [Qemu-devel] [PATCHv3 01/13] net: move CRC32 calculation from compute_mcast_idx() into its own net_crc32() function, Mark Cave-Ayland, 2017/12/15
- [Qemu-devel] [PATCHv3 09/13] lan9118: use inline net_crc32() and bitshift instead of compute_mcast_idx(), Mark Cave-Ayland, 2017/12/15
- [Qemu-devel] [PATCHv3 08/13] opencores_eth: use inline net_crc32() and bitshift instead of compute_mcast_idx(), Mark Cave-Ayland, 2017/12/15
- [Qemu-devel] [PATCHv3 07/13] eepro100: use inline net_crc32() and bitshift instead of compute_mcast_idx(), Mark Cave-Ayland, 2017/12/15
- [Qemu-devel] [PATCHv3 03/13] pcnet: switch pcnet over to use net_crc32_le(),
Mark Cave-Ayland <=
- [Qemu-devel] [PATCHv3 04/13] eepro100: switch eepro100 e100_compute_mcast_idx() over to use net_crc32(), Mark Cave-Ayland, 2017/12/15
- [Qemu-devel] [PATCHv3 05/13] sunhme: switch sunhme over to use net_crc32_le(), Mark Cave-Ayland, 2017/12/15
- [Qemu-devel] [PATCHv3 12/13] rtl8139: use inline net_crc32() and bitshift instead of compute_mcast_idx(), Mark Cave-Ayland, 2017/12/15
- [Qemu-devel] [PATCHv3 10/13] ftgmac100: use inline net_crc32() and bitshift instead of compute_mcast_idx(), Mark Cave-Ayland, 2017/12/15
- [Qemu-devel] [PATCHv3 13/13] net: remove unused compute_mcast_idx() function, Mark Cave-Ayland, 2017/12/15
- [Qemu-devel] [PATCHv3 11/13] ne2000: use inline net_crc32() and bitshift instead of compute_mcast_idx(), Mark Cave-Ayland, 2017/12/15
- Re: [Qemu-devel] [PATCHv3 00/13] net: introduce common net_crc32() and net_crc32_le() functions, Jason Wang, 2017/12/20