On Friday 20 June 2008 05:01, Bill Fink wrote:

On Wed, 18 Jun 2008, Laurent Pinchart wrote:

quoted

The restart() function is called when the link state changes and resets
multicast and promiscous settings. This patch restores those settings at 

the

quoted

end of restart().

Signed-off-by: Laurent Pinchart <redacted>
---
 drivers/net/fs_enet/mac-fcc.c     |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

Is the whole patch here?  The above says 2 files changed and 5 lines
changed, but what's included here is only 1 file and 3 line changes.

Yes it is. I've hand-removed a completely unrelated change that I had 
committed to my git tree in the same go (back when I wasn't very familiar 
with git). Do I need to resubmit ?

quoted

diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c
index ce40cf9..1a95cf1 100644
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.c

@@ -464,6 +464,9 @@ static void restart(struct net_device *dev)
 		C32(fccp, fcc_fpsmr, FCC_PSMR_FDE | FCC_PSMR_LPB);
 
 	S32(fccp, fcc_gfmr, FCC_GFMR_ENR | FCC_GFMR_ENT);
+
+	/* Restore multicast and promiscous settings */
+	set_multicast_list(dev);
 }
 
 static void stop(struct net_device *dev)

-- 
Laurent Pinchart
CSE Semaphore Belgium

Chaussee de Bruxelles, 732A
B-1410 Waterloo
Belgium

T +32 (2) 387 42 59
F +32 (2) 387 42 75