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

Commit 7ac8ff95 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by David S. Miller
Browse files

mvpp2: fix multicast address filter 



IPv6 doesn't work on the MacchiatoBIN board. It is caused by broken
multicast address filter in the mvpp2 driver.

The driver loads doesn't load any multicast entries if "allmulti" is not
set. This condition should be reversed.

The condition !netdev_mc_empty(dev) is useless (because
netdev_for_each_mc_addr is nop if the list is empty).

This patch also fixes a possible overflow of the multicast list - if
mvpp2_prs_mac_da_accept fails, we set the allmulti flag and retry.

Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 54e02162

drivers/net/ethernet/marvell/mvpp2.c

+8 −3
Original line number Diff line number Diff line
@@ -7137,6 +7137,7 @@ static void mvpp2_set_rx_mode(struct net_device *dev) 
	int id = port->id;

	bool allmulti = dev->flags & IFF_ALLMULTI;



retry:

	mvpp2_prs_mac_promisc_set(priv, id, dev->flags & IFF_PROMISC);

	mvpp2_prs_mac_multi_set(priv, id, MVPP2_PE_MAC_MC_ALL, allmulti);

	mvpp2_prs_mac_multi_set(priv, id, MVPP2_PE_MAC_MC_IP6, allmulti);
@@ -7144,9 +7145,13 @@ static void mvpp2_set_rx_mode(struct net_device *dev) 
	/* Remove all port->id's mcast enries */

	mvpp2_prs_mcast_del_all(priv, id);



	if (allmulti && !netdev_mc_empty(dev)) {

		netdev_for_each_mc_addr(ha, dev)

			mvpp2_prs_mac_da_accept(priv, id, ha->addr, true);

	if (!allmulti) {

		netdev_for_each_mc_addr(ha, dev) {

			if (mvpp2_prs_mac_da_accept(priv, id, ha->addr, true)) {

				allmulti = true;

				goto retry;

			}

		}

	}

}