From: Cong Wang <amwang@redhat.com>
To: Herbert Xu <herbert@gondor.hengli.com.au>
Cc: netdev@vger.kernel.org,
Stephen Hemminger <stephen@networkplumber.org>,
"David S. Miller" <davem@davemloft.net>,
Adam Baker <linux@baker-net.org.uk>
Subject: Re: [Patch net-next v3 2/3] bridge: only expire the mdb entry when query is received
Date: Thu, 09 May 2013 20:53:48 +0800 [thread overview]
Message-ID: <1368104028.12413.12.camel@cr0> (raw)
In-Reply-To: <20130509051522.GA7998@gondor.apana.org.au>
On Thu, 2013-05-09 at 13:15 +0800, Herbert Xu wrote:
>
> Yes this looks about right. BTW, for the groups-epcific queries
> you should use the leave timeout values and not the startup timeout
> values.
>
Right, something like below:
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 11946a4..1e414ce 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1252,20 +1252,13 @@ static void br_multicast_leave_group(struct
net_bridge *br,
if (br->multicast_querier &&
!timer_pending(&br->multicast_querier_timer)) {
- u32 sent;
-
__br_multicast_send_query(br, port, &mp->addr);
- sent = port ? port->multicast_startup_queries_sent :
- br->multicast_startup_queries_sent;
- time = jiffies;
- time += sent < br->multicast_startup_query_count ?
- br->multicast_startup_query_interval :
- br->multicast_query_interval;
- mod_timer(port ? &port->multicast_query_timer :
- &br->multicast_query_timer, time);
time = jiffies + br->multicast_last_member_count *
br->multicast_last_member_interval;
+ mod_timer(port ? &port->multicast_query_timer :
+ &br->multicast_query_timer, time);
+
for (p = mlock_dereference(mp->ports, br);
p != NULL;
p = mlock_dereference(p->next, br)) {
next prev parent reply other threads:[~2013-05-09 12:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-30 7:10 [Patch net-next v3 1/3] bridge: select IP addr as source addr for querier Cong Wang
2013-04-30 7:10 ` [Patch net-next v3 2/3] bridge: only expire the mdb entry when query is received Cong Wang
2013-05-02 1:59 ` Herbert Xu
2013-05-03 3:50 ` Cong Wang
2013-05-03 4:01 ` Herbert Xu
2013-05-03 7:08 ` Cong Wang
2013-05-03 9:30 ` Herbert Xu
2013-05-06 3:24 ` Cong Wang
2013-05-09 5:15 ` Herbert Xu
2013-05-09 12:53 ` Cong Wang [this message]
2013-05-10 3:21 ` Herbert Xu
2013-04-30 7:10 ` [Patch net-next v3 3/3] bridge: send query as soon as leave " Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1368104028.12413.12.camel@cr0 \
--to=amwang@redhat.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.hengli.com.au \
--cc=linux@baker-net.org.uk \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).