Re: [Patch net-next v3 2/3] bridge: only expire the mdb entry when query is received

[Cong Wang <amwang@redhat.com>]

On Thu, 2013-05-02 at 09:59 +0800, Herbert Xu wrote:
> On Tue, Apr 30, 2013 at 03:10:18PM +0800, Cong Wang wrote:
> >
> > @@ -1275,7 +1277,7 @@ static void br_multicast_leave_group(struct net_bridge *br,
> >  		     br->multicast_last_member_interval;
> >  
> >  	if (!port) {
> > -		if (mp->mglist &&
> > +		if (mp->mglist && mp->timer_armed &&
> >  		    (timer_pending(&mp->timer) ?
> >  		     time_after(mp->timer.expires, time) :
> >  		     try_to_del_timer_sync(&mp->timer) >= 0)) {
> 
> This whole section of code should now be removed since we're now
> only arming the timer in response to a query to that group.  Of
> course if we were the querier and sent out a query here then you'd
> need to simulate the reception of a query.

Hmm, this piece of code is checking if bridge itself is in the mdb entry
and if it just receives a leave, which seems still necessary... What am
I missing?

Thanks!