From patchwork Sun Apr 28 18:45:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1092326 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oZJoYSKo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44scHs5jT7z9s9N for ; Mon, 29 Apr 2019 04:48:25 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727258AbfD1SsY (ORCPT ); Sun, 28 Apr 2019 14:48:24 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:35469 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727175AbfD1SsD (ORCPT ); Sun, 28 Apr 2019 14:48:03 -0400 Received: by mail-wr1-f68.google.com with SMTP id f7so3976599wrs.2 for ; Sun, 28 Apr 2019 11:48:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=plHib9vZ9rGt4J+kst9eSiguWNDk3gfLy3okbaOCuxw=; b=oZJoYSKobP8KUpfstXSZtofuQR81veNhdyB9pCkMlEY6tp1lZoQt0JslB+RI+lBBI5 XMB7JI811/kpa7C94CRd4SJXjRz4P98GIVBZg5p2PJntmlop2ZptfAhr9NulFUHgSRSJ wx/nPkg+myHBnoSO9JYLVzdXdSnO/X+ZVznlqt9FpQ49dqyKSQORMsp40Y27GjLp8qxL m3lRtXMsRjZlroB8tJoZkVUV5xbg+xl7pfiRTUEbbAzZz50lHKc39n24vnSGMX4z+Xjp a7UmXWFEpBcM49bnOnTxl72QdZH9xEfUytVaQ96hhTJ/qzlI8OG34e1lxFSPcmahdqkt +fIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=plHib9vZ9rGt4J+kst9eSiguWNDk3gfLy3okbaOCuxw=; b=r73gi6sHyfILxvr66PFFI8eyiEO+W0srtOeX3gGgTzYEdYHmiN4Lk/e6rmtEPRT/UA Wz24CLOpCgqMrq+RQZxN3Ok2QE4CwN0mhUqEuxuzj8GuVb6JO+SBdwsh3jMM7S1/gmoK 6LBAo+nRCWAqXETKLc8TvuVxo8qtWewRz1Y0OgShaKH+ojYjsvm4xQfOPrmoKTR5QvZn 6St68p5EQSHLAqRVTIyTm1354ZA0lXRrLAjZ5W+brfEVf7RfSON8cOn2HpEzWKYP2dkF bEcaE9UGJ7nR0DpYPz9bsKKNAF4ksC4OSwMM9aznjXDoH7HfaQNVADiZ4eEHzCrhhdQX BfGw== X-Gm-Message-State: APjAAAWxSNShfbH9I7Z2DJEXJOuDry1iZRGks2jqbZCni2cUwpqu1kMD WV/u7pQ2HLbgGrnkLMigzsY= X-Google-Smtp-Source: APXvYqwFI7jQYdZil5SKITxwN7yIWwPc1RebevtHu6tDOdPw8A8Z96L+52ZeEH7keXP0nwuRAcle4w== X-Received: by 2002:a5d:6a51:: with SMTP id t17mr36908995wrw.329.1556477281744; Sun, 28 Apr 2019 11:48:01 -0700 (PDT) Received: from localhost.localdomain (5-12-225-227.residential.rdsnet.ro. [5.12.225.227]) by smtp.gmail.com with ESMTPSA id h5sm12254910wmf.38.2019.04.28.11.48.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 11:48:01 -0700 (PDT) From: Vladimir Oltean To: f.fainelli@gmail.com, vivien.didelot@gmail.com, andrew@lunn.ch, davem@davemloft.net Cc: netdev@vger.kernel.org, Vladimir Oltean Subject: [PATCH net-next 06/13] net: dsa: mt7530: Let DSA handle the unsetting of vlan_filtering Date: Sun, 28 Apr 2019 21:45:47 +0300 Message-Id: <20190428184554.9968-7-olteanv@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190428184554.9968-1-olteanv@gmail.com> References: <20190428184554.9968-1-olteanv@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The driver, recognizing that the .port_vlan_filtering callback was never coming after the port left its parent bridge, decided to take that duty in its own hands. DSA now takes care of this condition, so fix that. Signed-off-by: Vladimir Oltean Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli --- drivers/net/dsa/mt7530.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 7357b4fc0185..3530b6f38428 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -910,8 +910,6 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port, PCR_MATRIX(BIT(MT7530_CPU_PORT))); priv->ports[port].pm = PCR_MATRIX(BIT(MT7530_CPU_PORT)); - mt7530_port_set_vlan_unaware(ds, port); - mutex_unlock(&priv->reg_mutex); } @@ -1025,6 +1023,8 @@ mt7530_port_vlan_filtering(struct dsa_switch *ds, int port, */ mt7530_port_set_vlan_aware(ds, port); mt7530_port_set_vlan_aware(ds, MT7530_CPU_PORT); + } else { + mt7530_port_set_vlan_unaware(ds, port); } return 0;