rpms/kernel
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add fix for timer issue in bridge code (rhbz 980254)

Browse source
This commit is contained in:
Josh Boyer 2013-07-05 08:57:12 -04:00
commit 8fb285bdac
2 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
bridge-timer-fix.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index d6448e3..aadb596 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -269,7 +269,7 @@ static void br_multicast_del_pg(struct net_bridge *br,
del_timer(&p->timer);
call_rcu_bh(&p->rcu, br_multicast_free_pg);
- if (!mp->ports && !mp->mglist &&
+ if (!mp->ports && !mp->mglist && mp->timer_armed &&
netif_running(br->dev))
mod_timer(&mp->timer, jiffies);