Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b711d6d authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

mv643xx_eth: Neaten mv643xx_eth_program_multicast_filter 



The code around the allocation and loops are a bit obfuscated.

Neaten it by using:

o kcalloc with decimal count and sizeof(u32)
o Decimal loop indexing and i++ not i += 4
o A promiscuous block using a similar style
  to the multicast block
o Remove unnecessary variables

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 29feb66a

drivers/net/ethernet/marvell/mv643xx_eth.c

+22 −21
Original line number Diff line number Diff line
@@ -1845,29 +1845,19 @@ static void mv643xx_eth_program_multicast_filter(struct net_device *dev) 
	struct netdev_hw_addr *ha;

	int i;



	if (dev->flags & (IFF_PROMISC | IFF_ALLMULTI)) {

		int port_num;

		u32 accept;



oom:

		port_num = mp->port_num;

		accept = 0x01010101;

		for (i = 0; i < 0x100; i += 4) {

			wrl(mp, SPECIAL_MCAST_TABLE(port_num) + i, accept);

			wrl(mp, OTHER_MCAST_TABLE(port_num) + i, accept);

		}

		return;

	}

	if (dev->flags & (IFF_PROMISC | IFF_ALLMULTI))

		goto promiscuous;



	mc_spec = kzalloc(0x200, GFP_ATOMIC);

	if (mc_spec == NULL)

		goto oom;

	mc_other = mc_spec + (0x100 >> 2);

	/* Allocate both mc_spec and mc_other tables */

	mc_spec = kcalloc(128, sizeof(u32), GFP_ATOMIC);

	if (!mc_spec)

		goto promiscuous;

	mc_other = &mc_spec[64];



	netdev_for_each_mc_addr(ha, dev) {

		u8 *a = ha->addr;

		u32 *table;

		int entry;

		u8 entry;



		if (memcmp(a, "\x01\x00\x5e\x00\x00", 5) == 0) {

			table = mc_spec;
@@ -1880,12 +1870,23 @@ static void mv643xx_eth_program_multicast_filter(struct net_device *dev) 
		table[entry >> 2] |= 1 << (8 * (entry & 3));

	}



	for (i = 0; i < 0x100; i += 4) {

		wrl(mp, SPECIAL_MCAST_TABLE(mp->port_num) + i, mc_spec[i >> 2]);

		wrl(mp, OTHER_MCAST_TABLE(mp->port_num) + i, mc_other[i >> 2]);

	for (i = 0; i < 64; i++) {

		wrl(mp, SPECIAL_MCAST_TABLE(mp->port_num) + i * sizeof(u32),

		    mc_spec[i]);

		wrl(mp, OTHER_MCAST_TABLE(mp->port_num) + i * sizeof(u32),

		    mc_other[i]);

	}



	kfree(mc_spec);

	return;



promiscuous:

	for (i = 0; i < 64; i++) {

		wrl(mp, SPECIAL_MCAST_TABLE(mp->port_num) + i * sizeof(u32),

		    0x01010101u);

		wrl(mp, OTHER_MCAST_TABLE(mp->port_num) + i * sizeof(u32),

		    0x01010101u);

	}

}



static void mv643xx_eth_set_rx_mode(struct net_device *dev)