From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755331AbcEQPjb (ORCPT ); Tue, 17 May 2016 11:39:31 -0400 Received: from mail.savoirfairelinux.com ([208.88.110.44]:34053 "EHLO mail.savoirfairelinux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755182AbcEQPj3 (ORCPT ); Tue, 17 May 2016 11:39:29 -0400 From: Vivien Didelot To: David Miller Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@savoirfairelinux.com, andrew@lunn.ch, f.fainelli@gmail.com, jiri@resnulli.us Subject: Re: [PATCH net] net: dsa: mv88e6xxx: remove bridge work In-Reply-To: <20160516.134823.1909596879203571371.davem@davemloft.net> References: <1463186303-3139-1-git-send-email-vivien.didelot@savoirfairelinux.com> <8737plig1v.fsf@ketchup.mtl.sfl> <20160516.134823.1909596879203571371.davem@davemloft.net> User-Agent: Notmuch/0.22 (http://notmuchmail.org) Emacs/24.5.1 (x86_64-unknown-linux-gnu) Date: Tue, 17 May 2016 11:39:23 -0400 Message-ID: <87r3d01yok.fsf@ketchup.mtl.sfl> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi David, David Miller writes: > From: Vivien Didelot > Date: Fri, 13 May 2016 21:28:28 -0400 > >> Hi David, >> >> Vivien Didelot writes: >> >>> Now that the bridge code defers the switchdev port state setting, there >>> is no need to defer the port STP state change within the mv88e6xxx code. >>> Thus get rid of the driver's bridge work code. >>> >>> This also fixes a race condition where the DSA layer assumes that the >>> bridge code already set the unbridged port's STP state to Disabled >>> before restoring the Forwarding state. >>> >>> As a consequence, this also fixes the FDB flush for the unbridged port >>> which now correctly occurs during the Forwarding to Disabled transition. >>> >>> Fixes: 0bc05d585d38 ("switchdev: allow caller to explicitly request attr_set as deferred") >>> Reported-by: Andrew Lunn >>> Signed-off-by: Vivien Didelot >> >> This patch doesn't apply to -net, only applies to net-next... >> >> How should I handle that, do I resend a patch for net-next with the good >> subject prefix, and a v2 for -net? > > I applied this to net-next, thanks. Do we want to send this fix to -net as well? Thanks, Vivien