Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24f9cdcb authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

bridge: Fix timer typo that may render snooping less effective 



In a couple of spots where we are supposed to modify the port
group timer (p->timer) we instead modify the bridge interface
group timer (mp->timer).

The effect of this is mostly harmless.  However, it can cause
port subscriptions to be longer than they should be, thus making
snooping less effective.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6b0d6a9b

net/bridge/br_multicast.c

+2 −2
Original line number Diff line number Diff line
@@ -1178,7 +1178,7 @@ static int br_ip4_multicast_query(struct net_bridge *br, 
		if (timer_pending(&p->timer) ?

		    time_after(p->timer.expires, now + max_delay) :

		    try_to_del_timer_sync(&p->timer) >= 0)

			mod_timer(&mp->timer, now + max_delay);

			mod_timer(&p->timer, now + max_delay);

	}



out:
@@ -1249,7 +1249,7 @@ static int br_ip6_multicast_query(struct net_bridge *br, 
		if (timer_pending(&p->timer) ?

		    time_after(p->timer.expires, now + max_delay) :

		    try_to_del_timer_sync(&p->timer) >= 0)

			mod_timer(&mp->timer, now + max_delay);

			mod_timer(&p->timer, now + max_delay);

	}



out: