[PATCH] fs_enet: restore promiscuous and multicast settings in restart()

[PATCH] fs_enet: restore promiscuous and multicast settings in restart()

[Laurent Pinchart]

[-- Attachment #1: Type: text/plain, Size: 989 bytes --]

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

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

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)
-- 
1.5.0

-- 
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

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] fs_enet: restore promiscuous and multicast settings in restart()

[Matvejchikov Ilya]

I'm glad that you have corrected it. Half a year ago I pointed out
that there was such a mistake:
http://patchwork.ozlabs.org/linuxppc/patch?id=10700

Thanks.

2008/6/18 Laurent Pinchart <laurentp@cse-semaphore.com>:
> The restart() function is called when the link state changes and resets
> multicast and promiscous settings. This patch restores those settings at the
> end of restart().
>
> Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
> ---
>  drivers/net/fs_enet/mac-fcc.c     |    3 +++
>  2 files changed, 4 insertions(+), 1 deletions(-)
>
> 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)
> --
> 1.5.0
>
> --
> 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
>

Re: [PATCH] fs_enet: restore promiscuous and multicast settings in restart()

[Vitaly Bordug]

On Wed, 18 Jun 2008 22:45:57 +0400
"Matvejchikov Ilya" <matvejchikov@gmail.com> wrote:

> I'm glad that you have corrected it. Half a year ago I pointed out
> that there was such a mistake:
> http://patchwork.ozlabs.org/linuxppc/patch?id=10700
> 
You've used -embedded ML, and patch wasn't noticed... I can add your S-O-B line if that will make you fill better :) 

-Vitaly
> Thanks.
> 
> 2008/6/18 Laurent Pinchart <laurentp@cse-semaphore.com>:
> > The restart() function is called when the link state changes and resets
> > multicast and promiscous settings. This patch restores those settings at the
> > end of restart().
> >
> > Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
> > ---
> >  drivers/net/fs_enet/mac-fcc.c     |    3 +++
> >  2 files changed, 4 insertions(+), 1 deletions(-)
> >
> > 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)
> > --
> > 1.5.0
> >
> > --
> > 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
> >


-- 
Sincerely, 
Vitaly

Re: [PATCH] fs_enet: restore promiscuous and multicast settings in restart()

[Jon Loeliger]

Vitaly Bordug wrote:
> On Wed, 18 Jun 2008 22:45:57 +0400
> "Matvejchikov Ilya" <matvejchikov@gmail.com> wrote:
> 
>> I'm glad that you have corrected it. Half a year ago I pointed out
>> that there was such a mistake:
>> http://patchwork.ozlabs.org/linuxppc/patch?id=10700
>>
> You've used -embedded ML, and patch wasn't noticed... 

*sigh*

We should merge the -embedded list into -dev
and retire the -embedded list finally.

jdl

Re: [PATCH] fs_enet: restore promiscuous and multicast settings in restart()

[Olof Johansson]

On Jun 19, 2008, at 1:47 PM, Jon Loeliger wrote:

> We should merge the -embedded list into -dev
> and retire the -embedded list finally.

I used to be an opponent to this given the amount of "help my board  
doesn't work" questions on -embedded, but the volume isn't that great,  
and much lower than the -dev list anyway.

So yes, I agree.


-Olof

Re: [PATCH] fs_enet: restore promiscuous and multicast settings in restart()

[Matvejchikov Ilya]

Yes, please. =)

2008/6/19 Vitaly Bordug <vbordug@ru.mvista.com>:
> On Wed, 18 Jun 2008 22:45:57 +0400
> "Matvejchikov Ilya" <matvejchikov@gmail.com> wrote:
>
>> I'm glad that you have corrected it. Half a year ago I pointed out
>> that there was such a mistake:
>> http://patchwork.ozlabs.org/linuxppc/patch?id=10700
>>
> You've used -embedded ML, and patch wasn't noticed... I can add your S-O-B line if that will make you fill better :)
>
> -Vitaly
>> Thanks.
>>
>> 2008/6/18 Laurent Pinchart <laurentp@cse-semaphore.com>:
>> > The restart() function is called when the link state changes and resets
>> > multicast and promiscous settings. This patch restores those settings at the
>> > end of restart().
>> >
>> > Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
>> > ---
>> >  drivers/net/fs_enet/mac-fcc.c     |    3 +++
>> >  2 files changed, 4 insertions(+), 1 deletions(-)
>> >
>> > 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)
>> > --
>> > 1.5.0
>> >
>> > --
>> > 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
>> >
>
>
> --
> Sincerely,
> Vitaly
>

Re: [PATCH] fs_enet: restore promiscuous and multicast settings in restart()

[Bill Fink]

On Wed, 18 Jun 2008, Laurent Pinchart wrote:

> The restart() function is called when the link state changes and resets
> multicast and promiscous settings. This patch restores those settings at the
> end of restart().
> 
> Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
> ---
>  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.

> 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)

						-Bill

Re: [PATCH] fs_enet: restore promiscuous and multicast settings in restart()

[Laurent Pinchart]

[-- Attachment #1: Type: text/plain, Size: 1501 bytes --]

On Friday 20 June 2008 05:01, Bill Fink wrote:
> On Wed, 18 Jun 2008, Laurent Pinchart wrote:
> 
> > The restart() function is called when the link state changes and resets
> > multicast and promiscous settings. This patch restores those settings at 
the
> > end of restart().
> > 
> > Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
> > ---
> >  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 ?

> > 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

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] fs_enet: restore promiscuous and multicast settings in restart()

[Matvejchikov Ilya]

>> > 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);
>> >  }

Is it right to call set_multicast_list() after turning on transmitter
and receiver? May be swap this lines around?

Re: [PATCH] fs_enet: restore promiscuous and multicast settings in restart()

[Laurent Pinchart]

[-- Attachment #1: Type: text/plain, Size: 1087 bytes --]

Hi,

On Friday 20 June 2008 10:55, Matvejchikov Ilya wrote:
> >> > 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);
> >> >  }
> 
> Is it right to call set_multicast_list() after turning on transmitter
> and receiver? May be swap this lines around?

I'm not sure if that will make a difference, but you're right, restoring the 
multicast and promiscuous settings is better done before turning the receiver 
and transmitter on.

I'll send a new patch.

-- 
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

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: [PATCH] fs_enet: restore promiscuous and multicast settings in restart()

[Bill Fink]

On Fri, 20 Jun 2008, Laurent Pinchart wrote:

> On Friday 20 June 2008 05:01, Bill Fink wrote:
> > On Wed, 18 Jun 2008, Laurent Pinchart wrote:
> > 
> > > The restart() function is called when the link state changes and resets
> > > multicast and promiscous settings. This patch restores those settings at 
> the
> > > end of restart().
> > > 
> > > Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
> > > ---
> > >  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 ?

I can't answer that.  I just wanted to make sure part of the patch
wasn't accidentally left out.

						-Bill