summaryrefslogtreecommitdiffstats
path: root/bridge-timer-fix.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2013-07-11 16:08:40 -0500
committerJustin M. Forbes <jforbes@redhat.com>2013-07-11 16:08:40 -0500
commit9c63d892b79f4cd8be0857fe7151faff165a7e29 (patch)
tree4d2821d15adb2ac73048aef346389616bfb714e5 /bridge-timer-fix.patch
parentbc78224ff82aa095231fc8c2b14ea29c18bc7b4d (diff)
downloadkernel-9c63d892b79f4cd8be0857fe7151faff165a7e29.tar.gz
kernel-9c63d892b79f4cd8be0857fe7151faff165a7e29.tar.xz
kernel-9c63d892b79f4cd8be0857fe7151faff165a7e29.zip
Linux v3.10-9080-g19d2f8e
Diffstat (limited to 'bridge-timer-fix.patch')
-rw-r--r--bridge-timer-fix.patch13
1 files changed, 0 insertions, 13 deletions
diff --git a/bridge-timer-fix.patch b/bridge-timer-fix.patch
deleted file mode 100644
index 888a6f00..00000000
--- a/bridge-timer-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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);
-