net/usb: convert to use netdev_for_each_mc_addr (a92635dc) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/net/usb/asix.c

+4 −8

Original line number	Original line	Diff line number	Diff line
	@@ -555,20 +555,18 @@ static void asix_set_multicast(struct net_device *net)
	* for our 8 byte filter buffer		* for our 8 byte filter buffer
	* to avoid allocating memory that		* to avoid allocating memory that
	* is tricky to free later */		* is tricky to free later */
	struct dev_mc_list *mc_list = net->mc_list;		struct dev_mc_list *mc_list;
	u32 crc_bits;		u32 crc_bits;
	int i;

	memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);		memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);

	/* Build the multicast hash filter. */		/* Build the multicast hash filter. */
	for (i = 0; i < netdev_mc_count(net); i++) {		netdev_for_each_mc_addr(mc_list, net) {
	crc_bits =		crc_bits =
	ether_crc(ETH_ALEN,		ether_crc(ETH_ALEN,
	mc_list->dmi_addr) >> 26;		mc_list->dmi_addr) >> 26;
	data->multi_filter[crc_bits >> 3] \|=		data->multi_filter[crc_bits >> 3] \|=
	1 << (crc_bits & 7);		1 << (crc_bits & 7);
	mc_list = mc_list->next;
	}		}

	asix_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,		asix_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,
	@@ -769,20 +767,18 @@ static void ax88172_set_multicast(struct net_device *net)
	* for our 8 byte filter buffer		* for our 8 byte filter buffer
	* to avoid allocating memory that		* to avoid allocating memory that
	* is tricky to free later */		* is tricky to free later */
	struct dev_mc_list *mc_list = net->mc_list;		struct dev_mc_list *mc_list;
	u32 crc_bits;		u32 crc_bits;
	int i;

	memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);		memset(data->multi_filter, 0, AX_MCAST_FILTER_SIZE);

	/* Build the multicast hash filter. */		/* Build the multicast hash filter. */
	for (i = 0; i < netdev_mc_count(net); i++) {		netdev_for_each_mc_addr(mc_list, net) {
	crc_bits =		crc_bits =
	ether_crc(ETH_ALEN,		ether_crc(ETH_ALEN,
	mc_list->dmi_addr) >> 26;		mc_list->dmi_addr) >> 26;
	data->multi_filter[crc_bits >> 3] \|=		data->multi_filter[crc_bits >> 3] \|=
	1 << (crc_bits & 7);		1 << (crc_bits & 7);
	mc_list = mc_list->next;
	}		}

	asix_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,		asix_write_cmd_async(dev, AX_CMD_WRITE_MULTI_FILTER, 0, 0,

drivers/net/usb/catc.c

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -632,7 +632,6 @@ static void catc_set_multicast_list(struct net_device *netdev)
	struct dev_mc_list *mc;		struct dev_mc_list *mc;
	u8 broadcast[6];		u8 broadcast[6];
	u8 rx = RxEnable \| RxPolarity \| RxMultiCast;		u8 rx = RxEnable \| RxPolarity \| RxMultiCast;
	int i;

	memset(broadcast, 0xff, 6);		memset(broadcast, 0xff, 6);
	memset(catc->multicast, 0, 64);		memset(catc->multicast, 0, 64);
	@@ -648,9 +647,7 @@ static void catc_set_multicast_list(struct net_device *netdev)
	if (netdev->flags & IFF_ALLMULTI) {		if (netdev->flags & IFF_ALLMULTI) {
	memset(catc->multicast, 0xff, 64);		memset(catc->multicast, 0xff, 64);
	} else {		} else {
	for (i = 0, mc = netdev->mc_list;		netdev_for_each_mc_addr(mc, netdev) {
	mc && i < netdev_mc_count(netdev);
	i++, mc = mc->next) {
	u32 crc = ether_crc_le(6, mc->dmi_addr);		u32 crc = ether_crc_le(6, mc->dmi_addr);
	if (!catc->is_f5u011) {		if (!catc->is_f5u011) {
	catc->multicast[(crc >> 3) & 0x3f] \|= 1 << (crc & 7);		catc->multicast[(crc >> 3) & 0x3f] \|= 1 << (crc & 7);

drivers/net/usb/mcs7830.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -452,15 +452,13 @@ static void mcs7830_data_set_multicast(struct net_device *net)
	* for our 8 byte filter buffer		* for our 8 byte filter buffer
	* to avoid allocating memory that		* to avoid allocating memory that
	* is tricky to free later */		* is tricky to free later */
	struct dev_mc_list *mc_list = net->mc_list;		struct dev_mc_list *mc_list;
	u32 crc_bits;		u32 crc_bits;
	int i;

	/* Build the multicast hash filter. */		/* Build the multicast hash filter. */
	for (i = 0; i < netdev_mc_count(net); i++) {		netdev_for_each_mc_addr(mc_list, net) {
	crc_bits = ether_crc(ETH_ALEN, mc_list->dmi_addr) >> 26;		crc_bits = ether_crc(ETH_ALEN, mc_list->dmi_addr) >> 26;
	data->multi_filter[crc_bits >> 3] \|= 1 << (crc_bits & 7);		data->multi_filter[crc_bits >> 3] \|= 1 << (crc_bits & 7);
	mc_list = mc_list->next;
	}		}
	}		}
	}		}

drivers/net/usb/smsc95xx.c

+8 −18

Original line number	Original line	Diff line number	Diff line
	@@ -384,30 +384,20 @@ static void smsc95xx_set_multicast(struct net_device *netdev)
	pdata->mac_cr \|= MAC_CR_MCPAS_;		pdata->mac_cr \|= MAC_CR_MCPAS_;
	pdata->mac_cr &= ~(MAC_CR_PRMS_ \| MAC_CR_HPFILT_);		pdata->mac_cr &= ~(MAC_CR_PRMS_ \| MAC_CR_HPFILT_);
	} else if (!netdev_mc_empty(dev->net)) {		} else if (!netdev_mc_empty(dev->net)) {
	struct dev_mc_list *mc_list = dev->net->mc_list;		struct dev_mc_list *mc_list;
	int count = 0;

	pdata->mac_cr \|= MAC_CR_HPFILT_;		pdata->mac_cr \|= MAC_CR_HPFILT_;
	pdata->mac_cr &= ~(MAC_CR_PRMS_ \| MAC_CR_MCPAS_);		pdata->mac_cr &= ~(MAC_CR_PRMS_ \| MAC_CR_MCPAS_);

	while (mc_list) {		netdev_for_each_mc_addr(mc_list, netdev) {
	count++;
	if (mc_list->dmi_addrlen == ETH_ALEN) {
	u32 bitnum = smsc95xx_hash(mc_list->dmi_addr);		u32 bitnum = smsc95xx_hash(mc_list->dmi_addr);
	u32 mask = 0x01 << (bitnum & 0x1F);		u32 mask = 0x01 << (bitnum & 0x1F);
	if (bitnum & 0x20)		if (bitnum & 0x20)
	hash_hi \|= mask;		hash_hi \|= mask;
	else		else
	hash_lo \|= mask;		hash_lo \|= mask;
	} else {
	netdev_warn(dev->net, "dmi_addrlen != 6\n");
	}
	mc_list = mc_list->next;
	}		}

	if (count != ((u32) netdev_mc_count(dev->net)))
	netdev_warn(dev->net, "mc_count != dev->mc_count\n");

	netif_dbg(dev, drv, dev->net, "HASHH=0x%08X, HASHL=0x%08X\n",		netif_dbg(dev, drv, dev->net, "HASHH=0x%08X, HASHL=0x%08X\n",
	hash_hi, hash_lo);		hash_hi, hash_lo);
	} else {		} else {