| Message ID | 1442606151-50429-7-git-send-email-sfeldma@gmail.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sep. Friday 18 (38) 12:55 PM, sfeldma@gmail.com wrote: > From: Siva Mannem <siva.mannem.lnx@gmail.com> > > Signed-off-by: Siva Mannem <siva.mannem.lnx@gmail.com> > Signed-off-by: Scott Feldman <sfeldma@gmail.com> Acked-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Fri, Sep 18, 2015 at 09:55:50PM CEST, sfeldma@gmail.com wrote: >From: Siva Mannem <siva.mannem.lnx@gmail.com> > >Signed-off-by: Siva Mannem <siva.mannem.lnx@gmail.com> >Signed-off-by: Scott Feldman <sfeldma@gmail.com> Acked-by: Jiri Pirko <jiri@resnulli.us> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> From: Siva Mannem <siva.mannem.lnx@gmail.com> > > Signed-off-by: Siva Mannem <siva.mannem.lnx@gmail.com> > Signed-off-by: Scott Feldman <sfeldma@gmail.com> Acked-by: Premkumar Jonnala <pjonnala@broadcom.com> > --- > net/bridge/br_fdb.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c > index 9e9875d..6663cc0 100644 > --- a/net/bridge/br_fdb.c > +++ b/net/bridge/br_fdb.c > @@ -299,6 +299,8 @@ void br_fdb_cleanup(unsigned long _data) > unsigned long this_timer; > if (f->is_static) > continue; > + if (f->added_by_external_learn) > + continue; > this_timer = f->updated + delay; > if (time_before_eq(this_timer, jiffies)) > fdb_delete(br, f); > -- > 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 9e9875d..6663cc0 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -299,6 +299,8 @@ void br_fdb_cleanup(unsigned long _data) unsigned long this_timer; if (f->is_static) continue; + if (f->added_by_external_learn) + continue; this_timer = f->updated + delay; if (time_before_eq(this_timer, jiffies)) fdb_delete(br, f);