2.4.27: fixes for 8xx fec.c

PATCH Harald Küthe 1 participant 1 message Aug 10, 2004

lore

Share & tools

lore

Harald Küthe

author

2004-08-10 11:58 UTC #0 lore raw

Hi Florian

well you are right thank you.
Now the patch looks like:

arch/ppc/8xx_io/fec.c +5 -0

diff -urN linux-2.4.27.orig/arch/ppc/8xx_io/fec.c linux-2.4.27/arch/ppc/8xx_io/fec.c
@@ -1466,6 +1466,8 @@
 	return -ENODEV;		/* No PHY we understand */
 #else
 	fep->link = 1;
+	/* after ifconfig down and up fec will not start -> restart it */
+	fec_restart (dev, 0);
 	netif_start_queue(dev);
 	return 0;	/* Success */
 #endif	/* CONFIG_USE_MDIO */

@@ -2049,6 +2051,9 @@
 	fecp->fec_imask = ( FEC_ENET_TXF | FEC_ENET_TXB |
 			    FEC_ENET_RXF | FEC_ENET_RXB | FEC_ENET_MII );
 
+	/* set old promiscuous/multicast settings which are lost above */
+	set_multicast_list(dev);
+
 	/* And last, enable the transmit and receive processing.
 	*/
 	fecp->fec_ecntrl = FEC_ECNTRL_PINMUX | FEC_ECNTRL_ETHER_EN;

Reagrds
Harald

Quoted 1 line

Quoted 1 line
Quoted 1 line
Florian Schirmer <[email protected]> 10.08.04 10:42:12 >>>

Hi,

Quoted 10 lines

(quoted diff) +5 -0

+
+#ifndef	CONFIG_USE_MDIO
+	fec_restart (dev, 0);
+#endif
+

	netif_start_queue(dev);
	return 0;	/* Success */

#endif /* CONFIG_USE_MDIO */

Just a minor hint: you don't need the #ifndef CONFIG_USE_MDIO guard since you're already in the non MDIO branch (see #endif comment).

Greetings,
Florian