Commit 8751b12c authored Oct 22, 2014 by LEROY Christophe Committed by David S. Miller Oct 22, 2014

net: fs_enet: set back promiscuity mode after restart



After interface restart (eg: after link disconnection/reconnection), the bridge
function doesn't work anymore. This is due to the promiscuous mode being cleared
by the restart.

The mac-fcc already includes code to set the promiscuous mode back during the restart.
This patch adds the same handling to mac-fec and mac-scc.

Tested with bridge function on MPC885 with FEC.

Reported-by: Germain Montoies <germain.montoies@c-s.fr>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a63ba13e

drivers/net/ethernet/freescale/fs_enet/mac-fec.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -341,6 +341,9 @@ static void restart(struct net_device *dev)
		FC(fecp, x_cntrl, FEC_TCNTRL_FDEN); /* FD disable */
		}

		/* Restore multicast and promiscuous settings */
		set_multicast_list(dev);

		/*
		* Enable interrupts we wish to service.
		*/

drivers/net/ethernet/freescale/fs_enet/mac-scc.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -355,6 +355,9 @@ static void restart(struct net_device *dev)
		if (fep->phydev->duplex)
		S16(sccp, scc_psmr, SCC_PSMR_LPB \| SCC_PSMR_FDE);

		/* Restore multicast and promiscuous settings */
		set_multicast_list(dev);

		S32(sccp, scc_gsmrl, SCC_GSMRL_ENR \| SCC_GSMRL_ENT);
		}