Re: [Patch net-next v3 2/3] bridge: only expire the mdb entry when query is received
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: 2013-05-02 01:59:43
On Tue, Apr 30, 2013 at 03:10:18PM +0800, Cong Wang wrote:
quoted hunk ↗ jump to hunk
@@ -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. Cheers, -- Email: Herbert Xu [off-list ref] Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt