netdev - Re: [Patch net-next v3 2/3] bridge: only expire the mdb entry when query is received

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1368104028.12413.12.camel@cr0>
Date:	Thu, 09 May 2013 20:53:48 +0800
From:	Cong Wang <amwang@...hat.com>
To:	Herbert Xu <herbert@...dor.hengli.com.au>
Cc:	netdev@...r.kernel.org,
	Stephen Hemminger <stephen@...workplumber.org>,
	"David S. Miller" <davem@...emloft.net>,
	Adam Baker <linux@...er-net.org.uk>
Subject: Re: [Patch net-next v3 2/3] bridge: only expire the mdb entry when
 query is received

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)) {


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html