From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE82EC0650F for ; Tue, 30 Jul 2019 13:58:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7FB1E2089E for ; Tue, 30 Jul 2019 13:58:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fENZINM7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728553AbfG3N6G (ORCPT ); Tue, 30 Jul 2019 09:58:06 -0400 Received: from mail-io1-f67.google.com ([209.85.166.67]:33151 "EHLO mail-io1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725871AbfG3N6G (ORCPT ); Tue, 30 Jul 2019 09:58:06 -0400 Received: by mail-io1-f67.google.com with SMTP id z3so9388309iog.0 for ; Tue, 30 Jul 2019 06:58:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=8nB6UOzgonvSgIT4y+9poBDn/jzEnMha8n1NPzW/YvQ=; b=fENZINM7Mxpu4pmIjemj1Ft671AiOSHGKCfYHIezbR7BRrcad7Kt63UyhqN4bHOD/0 SGtxFM+ZGjcOq6pqFc5CSnnrQ22j1NUyviL7ZCnIeKqAYNlFx9tq5K5eLzYwvKepVzdJ dlolAynjEXybnLijnok1Nh0b7P2cl9nnTUfLwL4zjezR99zkDtPbtyV0bzYCdXshj3QY TH6BHAvy5283v2TTfrmMKc7bwbObtMq3vWdgU1OGKIWFzI12RrMueopRo42llVlF3gN1 VaMKjSD7etp/RcVLPV9RB35IAAhLT1FJofVLG5l1T8FQy11QI7aT/ACvSfXfTlVNNPQC Mlkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=8nB6UOzgonvSgIT4y+9poBDn/jzEnMha8n1NPzW/YvQ=; b=HJHnTO4KtqXLsM3FNdKHSi47DwaMW5Q7yRifW9WB26XCN95AkRcwANd/2DI2Mkeq1v a1Z0v80Ue4Fpml0ROhVDjd8CNshE9zdKv9BHmhz6PRZwuibGyTRIHy5e48qcjVsZV0ik vLscak/NKL7y8mSzJ1WVaVkj39/vZ8m5heX101lMfCsOeGQFHcWs6nb0g53YyzHmAk5e 5yeudCfzuTrNX9M2HzFDAU2W7NNcAx/4QH2OArW+8osePd498IPmW6p1gCClWMWiHvjk 5vehrbJuBYbW2e0a0pu78ViNIijdL+4T7ABLkuQiwP5Grrzx17+r4+L20+mBGqOjFq6B dN3g== X-Gm-Message-State: APjAAAVz14otk0wg/iY6TTnBJdKlZwk97fnVjJfb+TMPh8iEw2YFp7Ww 06tn4eP5og4yP6woQSH/SqE= X-Google-Smtp-Source: APXvYqzZjcl3uwUJZR4nFPY3D8p6RvxZgBcbascWcjQ17GiagCq3hL/xjj3rRouFr2ZuUb3/MT4P4w== X-Received: by 2002:a02:ce35:: with SMTP id v21mr29517008jar.108.1564495085399; Tue, 30 Jul 2019 06:58:05 -0700 (PDT) Received: from ?IPv6:2601:282:800:fd80:48fd:47f6:b7d0:19dc? ([2601:282:800:fd80:48fd:47f6:b7d0:19dc]) by smtp.googlemail.com with ESMTPSA id n22sm106251580iob.37.2019.07.30.06.58.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jul 2019 06:58:04 -0700 (PDT) Subject: Re: [PATCH net] net: bridge: mcast: don't delete permanent entries when fast leave is enabled To: Nikolay Aleksandrov , netdev@vger.kernel.org Cc: davem@davemloft.net, roopa@cumulusnetworks.com, bridge@lists.linux-foundation.org References: <20190730112100.18156-1-nikolay@cumulusnetworks.com> From: David Ahern Message-ID: <4511701d-88c4-a937-2fbc-b557033a24ed@gmail.com> Date: Tue, 30 Jul 2019 07:58:03 -0600 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <20190730112100.18156-1-nikolay@cumulusnetworks.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 7/30/19 5:21 AM, Nikolay Aleksandrov wrote: > diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c > index 3d8deac2353d..f8cac3702712 100644 > --- a/net/bridge/br_multicast.c > +++ b/net/bridge/br_multicast.c > @@ -1388,6 +1388,9 @@ br_multicast_leave_group(struct net_bridge *br, > if (!br_port_group_equal(p, port, src)) > continue; > > + if (p->flags & MDB_PG_FLAGS_PERMANENT) > + break; > + > rcu_assign_pointer(*pp, p->next); > hlist_del_init(&p->mglist); > del_timer(&p->timer); Why 'break' and not 'continue' like you have with if (!br_port_group_equal(p, port, src))