diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2011-02-11 13:42:07 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-12 06:59:37 +0100 |
| commit | 24f9cdcbd743fd6adb8fb83688d8d86dcccde662 (patch) | |
| tree | 95913d38abc0ec80c4bfa0ca8af478e63de137f8 /net/bridge | |
| parent | bridge: Fix mglist corruption that leads to memory corruption (diff) | |
| download | linux-24f9cdcbd743fd6adb8fb83688d8d86dcccde662.tar.xz linux-24f9cdcbd743fd6adb8fb83688d8d86dcccde662.zip | |
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>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_multicast.c | 4 |
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, 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: |