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

Commit ddc0bf34 authored by Esben Haabendal's avatar Esben Haabendal Committed by David S. Miller
Browse files

net: ll_temac: Do not make promiscuous mode sticky on multicast 



When user has requested IFF_ALLMULTI or have set more than 4 multicast
addresses, we should just use promiscuous mode, but not set it in flags,
as it causes the interface to stay in promiscuous mode even when the
non-IFF_PROMISC condition that caused promiscuous mode to be enabled
has gone away.

Signed-off-by: default avatarEsben Haabendal <esben@geanix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5556fdb0

drivers/net/ethernet/xilinx/ll_temac_main.c

+0 −7
Original line number Diff line number Diff line
@@ -389,13 +389,6 @@ static void temac_set_multicast_list(struct net_device *ndev) 
	mutex_lock(lp->indirect_mutex);

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

	    netdev_mc_count(ndev) > MULTICAST_CAM_TABLE_NUM) {

		/*

		 *	We must make the kernel realise we had to move

		 *	into promisc mode or we start all out war on

		 *	the cable. If it was a promisc request the

		 *	flag is already set. If not we assert it.

		 */

		ndev->flags |= IFF_PROMISC;

		temac_indirect_out32(lp, XTE_AFM_OFFSET, XTE_AFM_EPPRM_MASK);

		dev_info(&ndev->dev, "Promiscuous mode enabled.\n");

	} else if (!netdev_mc_empty(ndev)) {