From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754513AbcEPRs1 (ORCPT ); Mon, 16 May 2016 13:48:27 -0400 Received: from shards.monkeyblade.net ([149.20.54.216]:36792 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754073AbcEPRsZ (ORCPT ); Mon, 16 May 2016 13:48:25 -0400 Date: Mon, 16 May 2016 13:48:23 -0400 (EDT) Message-Id: <20160516.134823.1909596879203571371.davem@davemloft.net> To: vivien.didelot@savoirfairelinux.com 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 From: David Miller In-Reply-To: <8737plig1v.fsf@ketchup.mtl.sfl> References: <1463186303-3139-1-git-send-email-vivien.didelot@savoirfairelinux.com> <8737plig1v.fsf@ketchup.mtl.sfl> X-Mailer: Mew version 6.6 on Emacs 24.5 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Mon, 16 May 2016 10:48:24 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.