cassini: convert to use netdev_for_each_mc_addr (d7b855c2) · Commits · 戴 / test

drivers/net/cassini.c

+35 −37

Original line number	Diff line number	Diff line
		@@ -2999,58 +2999,56 @@ static inline void cas_init_dma(struct cas *cp)
		cas_init_rx_dma(cp);
		}

		/* Must be invoked under cp->lock. */
		static u32 cas_setup_multicast(struct cas *cp)
		static void cas_process_mc_list(struct cas *cp)
		{
		u32 rxcfg = 0;
		int i;

		if (cp->dev->flags & IFF_PROMISC) {
		rxcfg \|= MAC_RX_CFG_PROMISC_EN;

		} else if (cp->dev->flags & IFF_ALLMULTI) {
		for (i=0; i < 16; i++)
		writel(0xFFFF, cp->regs + REG_MAC_HASH_TABLEN(i));
		rxcfg \|= MAC_RX_CFG_HASH_FILTER_EN;

		} else {
		u16 hash_table[16];
		u32 crc;
		struct dev_mc_list *dmi = cp->dev->mc_list;
		int i;
		struct dev_mc_list *dmi;
		int i = 1;

		memset(hash_table, 0, sizeof(hash_table));
		netdev_for_each_mc_addr(dmi, cp->dev) {
		if (i <= CAS_MC_EXACT_MATCH_SIZE) {
		/* use the alternate mac address registers for the
		* first 15 multicast addresses
		*/
		for (i = 1; i <= CAS_MC_EXACT_MATCH_SIZE; i++) {
		if (!dmi) {
		writel(0x0, cp->regs + REG_MAC_ADDRN(i*3 + 0));
		writel(0x0, cp->regs + REG_MAC_ADDRN(i*3 + 1));
		writel(0x0, cp->regs + REG_MAC_ADDRN(i*3 + 2));
		continue;
		}
		writel((dmi->dmi_addr[4] << 8) \| dmi->dmi_addr[5],
		cp->regs + REG_MAC_ADDRN(i*3 + 0));
		writel((dmi->dmi_addr[2] << 8) \| dmi->dmi_addr[3],
		cp->regs + REG_MAC_ADDRN(i*3 + 1));
		writel((dmi->dmi_addr[0] << 8) \| dmi->dmi_addr[1],
		cp->regs + REG_MAC_ADDRN(i*3 + 2));
		dmi = dmi->next;
		i++;
		}

		else {
		/* use hw hash table for the next series of
		* multicast addresses
		*/
		memset(hash_table, 0, sizeof(hash_table));
		while (dmi) {
		crc = ether_crc_le(ETH_ALEN, dmi->dmi_addr);
		crc >>= 24;
		hash_table[crc >> 4] \|= 1 << (15 - (crc & 0xf));
		dmi = dmi->next;
		}
		}
		for (i = 0; i < 16; i++)
		writel(hash_table[i], cp->regs + REG_MAC_HASH_TABLEN(i));
		}

		/* Must be invoked under cp->lock. */
		static u32 cas_setup_multicast(struct cas *cp)
		{
		u32 rxcfg = 0;
		int i;

		if (cp->dev->flags & IFF_PROMISC) {
		rxcfg \|= MAC_RX_CFG_PROMISC_EN;

		} else if (cp->dev->flags & IFF_ALLMULTI) {
		for (i=0; i < 16; i++)
		writel(hash_table[i], cp->regs +
		REG_MAC_HASH_TABLEN(i));
		writel(0xFFFF, cp->regs + REG_MAC_HASH_TABLEN(i));
		rxcfg \|= MAC_RX_CFG_HASH_FILTER_EN;

		} else {
		cas_process_mc_list(cp);
		rxcfg \|= MAC_RX_CFG_HASH_FILTER_EN;
		}

Admin message