From patchwork Tue Apr 30 07:10:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amerigo Wang X-Patchwork-Id: 240574 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2C9112C00BA for ; Tue, 30 Apr 2013 17:11:02 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758563Ab3D3HK5 (ORCPT ); Tue, 30 Apr 2013 03:10:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46658 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758244Ab3D3HK4 (ORCPT ); Tue, 30 Apr 2013 03:10:56 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3U7AlQr016229 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 30 Apr 2013 03:10:47 -0400 Received: from cr0.redhat.com (vpn1-112-4.nay.redhat.com [10.66.112.4]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3U7ARhW030093; Tue, 30 Apr 2013 03:10:43 -0400 From: Cong Wang To: netdev@vger.kernel.org Cc: Herbert Xu , Stephen Hemminger , "David S. Miller" , Adam Baker , Cong Wang Subject: [Patch net-next v3 3/3] bridge: send query as soon as leave is received Date: Tue, 30 Apr 2013 15:10:19 +0800 Message-Id: <1367305819-14013-3-git-send-email-amwang@redhat.com> In-Reply-To: <1367305819-14013-1-git-send-email-amwang@redhat.com> References: <1367305819-14013-1-git-send-email-amwang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Cong Wang Send a non-general query when leave is received, if the user marks it as a querier. Cc: Herbert Xu Cc: Stephen Hemminger Cc: "David S. Miller" Cc: Adam Baker Signed-off-by: Cong Wang --- v3: use non-general query v2: only send query to the port received leave net/bridge/br_multicast.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 6a05522..d73276b 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1250,6 +1250,21 @@ static void br_multicast_leave_group(struct net_bridge *br, if (!mp) goto out; + 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); + } + if (port && (port->flags & BR_MULTICAST_FAST_LEAVE)) { struct net_bridge_port_group __rcu **pp;