From a09d956b9e21f4e443f88e6f899260be3337cf83 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Fri, 11 Feb 2011 12:36:55 +0000 Subject: [PATCH] --- yaml --- r: 233417 b: refs/heads/master c: 6b0d6a9b4296fa16a28d10d416db7a770fc03287 h: refs/heads/master i: 233415: 114c29cc7cd2b99618491dc8eade808620b42bd0 v: v3 --- [refs] | 2 +- trunk/net/bridge/br_multicast.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7f1c6c5247c6..71710db2127b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 946bf5ee3c46f73b5cbd52aab594697b1a132d1f +refs/heads/master: 6b0d6a9b4296fa16a28d10d416db7a770fc03287 diff --git a/trunk/net/bridge/br_multicast.c b/trunk/net/bridge/br_multicast.c index f701a21acb34..fdbd41c76ec4 100644 --- a/trunk/net/bridge/br_multicast.c +++ b/trunk/net/bridge/br_multicast.c @@ -719,7 +719,8 @@ static int br_multicast_add_group(struct net_bridge *br, goto err; if (!port) { - hlist_add_head(&mp->mglist, &br->mglist); + if (hlist_unhashed(&mp->mglist)) + hlist_add_head(&mp->mglist, &br->mglist); mod_timer(&mp->timer, now + br->multicast_membership_interval); goto out; }