Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/linux.git] / drivers / net / ethernet / dec / tulip / de4x5.c

diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
index f0e9e2ef62a06e3e04a7c71516d2849c251397fa..6620fc861c477eeb38d3c2b9495619b0e65ca63a 100644 (file)
--- a/drivers/net/ethernet/dec/tulip/de4x5.c
+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
@@ -1966,7 +1966,7 @@ SetMulticastFilter(struct net_device *dev)
     } else if (lp->setup_f == HASH_PERF) {   /* Hash Filtering */
        netdev_for_each_mc_addr(ha, dev) {
                crc = ether_crc_le(ETH_ALEN, ha->addr);
-               hashcode = crc & HASH_BITS;  /* hashcode is 9 LSb of CRC */
+               hashcode = crc & DE4X5_HASH_BITS;  /* hashcode is 9 LSb of CRC */
 
                byte = hashcode >> 3;        /* bit[3-8] -> byte in filter */
                bit = 1 << (hashcode & 0x07);/* bit[0-2] -> bit in byte */
@@ -5043,7 +5043,7 @@ build_setup_frame(struct net_device *dev, int mode)
            *(pa + i) = dev->dev_addr[i];                 /* Host address */
            if (i & 0x01) pa += 2;
        }
-       *(lp->setup_frame + (HASH_TABLE_LEN >> 3) - 3) = 0x80;
+       *(lp->setup_frame + (DE4X5_HASH_TABLE_LEN >> 3) - 3) = 0x80;
     } else {
        for (i=0; i<ETH_ALEN; i++) { /* Host address */
            *(pa + (i&1)) = dev->dev_addr[i];