aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2011-02-11 07:42:07 -0500
committerDavid S. Miller <davem@davemloft.net>2011-02-12 00:59:37 -0500
commit24f9cdcbd743fd6adb8fb83688d8d86dcccde662 (patch)
tree95913d38abc0ec80c4bfa0ca8af478e63de137f8
parent6b0d6a9b4296fa16a28d10d416db7a770fc03287 (diff)
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: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/bridge/br_multicast.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index fdbd41c76ec4..c558274051eb 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1178,7 +1178,7 @@ static int br_ip4_multicast_query(struct net_bridge *br,
1178 if (timer_pending(&p->timer) ? 1178 if (timer_pending(&p->timer) ?
1179 time_after(p->timer.expires, now + max_delay) : 1179 time_after(p->timer.expires, now + max_delay) :
1180 try_to_del_timer_sync(&p->timer) >= 0) 1180 try_to_del_timer_sync(&p->timer) >= 0)
1181 mod_timer(&mp->timer, now + max_delay); 1181 mod_timer(&p->timer, now + max_delay);
1182 } 1182 }
1183 1183
1184out: 1184out:
@@ -1249,7 +1249,7 @@ static int br_ip6_multicast_query(struct net_bridge *br,
1249 if (timer_pending(&p->timer) ? 1249 if (timer_pending(&p->timer) ?
1250 time_after(p->timer.expires, now + max_delay) : 1250 time_after(p->timer.expires, now + max_delay) :
1251 try_to_del_timer_sync(&p->timer) >= 0) 1251 try_to_del_timer_sync(&p->timer) >= 0)
1252 mod_timer(&mp->timer, now + max_delay); 1252 mod_timer(&p->timer, now + max_delay);
1253 } 1253 }
1254 1254
1255out: 1255out: