Commit 084e2b11 authored by Mark Cave-Ayland's avatar Mark Cave-Ayland Committed by Jason Wang
Browse files

ne2000: use inline net_crc32() and bitshift instead of compute_mcast_idx() 



This makes it much easier to compare the multicast CRC calculation endian and
bitshift against the Linux driver implementation.

Signed-off-by: default avatarMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
parent 4227be63

hw/net/ne2000.c

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
 */

#include "qemu/osdep.h"

#include "hw/pci/pci.h"

#include "net/net.h"

#include "net/eth.h"

#include "ne2000.h"

#include "hw/loader.h"

#include "sysemu/sysemu.h"
@@ -199,7 +201,7 @@ ssize_t ne2000_receive(NetClientState *nc, const uint8_t *buf, size_t size_) 
            /* multicast */

            if (!(s->rxcr & 0x08))

                return size;

            mcast_idx = compute_mcast_idx(buf);

            mcast_idx = net_crc32(buf, ETH_ALEN) >> 26;

            if (!(s->mult[mcast_idx >> 3] & (1 << (mcast_idx & 7))))

                return size;

        } else if (s->mem[0] == buf[0] &&