|
@@ -135,7 +135,7 @@
|
|
#define RX_DESC_SIZE (RX_DCNT * sizeof(struct r6040_descriptor))
|
|
#define RX_DESC_SIZE (RX_DCNT * sizeof(struct r6040_descriptor))
|
|
#define TX_DESC_SIZE (TX_DCNT * sizeof(struct r6040_descriptor))
|
|
#define TX_DESC_SIZE (TX_DCNT * sizeof(struct r6040_descriptor))
|
|
#define MBCR_DEFAULT 0x012A /* MAC Bus Control Register */
|
|
#define MBCR_DEFAULT 0x012A /* MAC Bus Control Register */
|
|
-#define MCAST_MAX 4 /* Max number multicast addresses to filter */
|
|
|
|
|
|
+#define MCAST_MAX 3 /* Max number multicast addresses to filter */
|
|
|
|
|
|
/* Descriptor status */
|
|
/* Descriptor status */
|
|
#define DSC_OWNER_MAC 0x8000 /* MAC is the owner of this descriptor */
|
|
#define DSC_OWNER_MAC 0x8000 /* MAC is the owner of this descriptor */
|
|
@@ -983,9 +983,6 @@ static void r6040_multicast_list(struct net_device *dev)
|
|
crc >>= 26;
|
|
crc >>= 26;
|
|
hash_table[crc >> 4] |= 1 << (15 - (crc & 0xf));
|
|
hash_table[crc >> 4] |= 1 << (15 - (crc & 0xf));
|
|
}
|
|
}
|
|
- /* Write the index of the hash table */
|
|
|
|
- for (i = 0; i < 4; i++)
|
|
|
|
- iowrite16(hash_table[i] << 14, ioaddr + MCR1);
|
|
|
|
/* Fill the MAC hash tables with their values */
|
|
/* Fill the MAC hash tables with their values */
|
|
iowrite16(hash_table[0], ioaddr + MAR0);
|
|
iowrite16(hash_table[0], ioaddr + MAR0);
|
|
iowrite16(hash_table[1], ioaddr + MAR1);
|
|
iowrite16(hash_table[1], ioaddr + MAR1);
|
|
@@ -1001,9 +998,9 @@ static void r6040_multicast_list(struct net_device *dev)
|
|
iowrite16(adrp[1], ioaddr + MID_1M + 8 * i);
|
|
iowrite16(adrp[1], ioaddr + MID_1M + 8 * i);
|
|
iowrite16(adrp[2], ioaddr + MID_1H + 8 * i);
|
|
iowrite16(adrp[2], ioaddr + MID_1H + 8 * i);
|
|
} else {
|
|
} else {
|
|
- iowrite16(0xffff, ioaddr + MID_0L + 8 * i);
|
|
|
|
- iowrite16(0xffff, ioaddr + MID_0M + 8 * i);
|
|
|
|
- iowrite16(0xffff, ioaddr + MID_0H + 8 * i);
|
|
|
|
|
|
+ iowrite16(0xffff, ioaddr + MID_1L + 8 * i);
|
|
|
|
+ iowrite16(0xffff, ioaddr + MID_1M + 8 * i);
|
|
|
|
+ iowrite16(0xffff, ioaddr + MID_1H + 8 * i);
|
|
}
|
|
}
|
|
i++;
|
|
i++;
|
|
}
|
|
}
|