]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
bridge: do not call setup_timer() multiple times
authorEric Dumazet <edumazet@google.com>
Sat, 20 Jul 2013 03:07:16 +0000 (20:07 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 20 Jul 2013 05:12:42 +0000 (22:12 -0700)
commit1faabf2aab1fdaa1ace4e8c829d1b9cf7bfec2f1
treec72272a0e485820f9d486012cd555f1a953bc977
parent651e92716aaae60fc41b9652f54cb6803896e0da
bridge: do not call setup_timer() multiple times

commit 9f00b2e7cf24 ("bridge: only expire the mdb entry when query is
received") added a nasty bug as an active timer can be reinitialized.

setup_timer() must be done once, no matter how many time mod_timer()
is called. br_multicast_new_group() is the right place to do this.

Reported-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Diagnosed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Tested-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Cc: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_multicast.c