diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2013-07-05 08:57:12 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2013-07-05 09:05:28 -0400 |
| commit | 8fb285bdac75a903894b65ca8a9ef1172d37aeb4 (patch) | |
| tree | 61195ff2c0d921075e98bcf78cd109705eaa7020 /bridge-timer-fix.patch | |
| parent | af1ede06d2a0b705fb90c01df64829f83aa21eb6 (diff) | |
| download | kernel-8fb285bdac75a903894b65ca8a9ef1172d37aeb4.tar.gz kernel-8fb285bdac75a903894b65ca8a9ef1172d37aeb4.tar.xz kernel-8fb285bdac75a903894b65ca8a9ef1172d37aeb4.zip | |
Add fix for timer issue in bridge code (rhbz 980254)
Diffstat (limited to 'bridge-timer-fix.patch')
| -rw-r--r-- | bridge-timer-fix.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/bridge-timer-fix.patch b/bridge-timer-fix.patch new file mode 100644 index 000000000..888a6f009 --- /dev/null +++ b/bridge-timer-fix.patch @@ -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); + |