From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753528AbdKIItN (ORCPT ); Thu, 9 Nov 2017 03:49:13 -0500 Received: from aibo.runbox.com ([91.220.196.211]:39030 "EHLO aibo.runbox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753436AbdKIItL (ORCPT ); Thu, 9 Nov 2017 03:49:11 -0500 Subject: Re: [PATCH net-next 2/6] net: dsa: return after mdb prepare phase To: Vivien Didelot , netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com, "David S. Miller" , Florian Fainelli , Andrew Lunn References: <20171108171917.5965-1-vivien.didelot@savoirfairelinux.com> <20171108171917.5965-3-vivien.didelot@savoirfairelinux.com> From: Egil Hjelmeland Message-ID: Date: Thu, 9 Nov 2017 09:48:40 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171108171917.5965-3-vivien.didelot@savoirfairelinux.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 08. nov. 2017 18:19, Vivien Didelot wrote: > The current code does not return after successfully preparing the MDB > addition on every ports member of a multicast group. Fix this. > > Fixes: a1a6b7ea7f2d ("net: dsa: add cross-chip multicast support") > Reported-by: Egil Hjelmeland > Signed-off-by: Vivien Didelot > --- > net/dsa/switch.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/net/dsa/switch.c b/net/dsa/switch.c > index 04e8ad2c3d5d..0041aba5c339 100644 > --- a/net/dsa/switch.c > +++ b/net/dsa/switch.c > @@ -133,6 +133,8 @@ static int dsa_switch_mdb_add(struct dsa_switch *ds, > if (err) > return err; > } > + > + return 0; > } > > for_each_set_bit(port, group, ds->num_ports) > Hi Vivien! Will this cause a merge-conflict with the "net" patch you sent, when "net" is merged to "net-next"? Perhaps more polite to hold on to this (and following patches) until "net" patch has trickled through the system? Regards Egil