From patchwork Sun Apr 28 18:45:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 1092320 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="TjdvRJV+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44scHd67Nxz9s9N for ; Mon, 29 Apr 2019 04:48:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727238AbfD1SsM (ORCPT ); Sun, 28 Apr 2019 14:48:12 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:36711 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727100AbfD1SsJ (ORCPT ); Sun, 28 Apr 2019 14:48:09 -0400 Received: by mail-wr1-f65.google.com with SMTP id o4so545231wra.3 for ; Sun, 28 Apr 2019 11:48:08 -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=JTn7lZl1T4B/ILLIVfMdDo0g7+WeVfKhKYkSV8hbpC0=; b=TjdvRJV+3FVMHcmJXppkLwtfzAcbR6/1gUJbipAepxea6DUHtu2k8S8cMrDBu6f2fi zv9AHrBDg1hjCjifkdT8uzVdmxJUYB8mS/EabiUEQMOYwPzk2XpMSiV1cGFd/V8FSpAG 66B15GEjMPOUgYSlNbyP8pTM704plBhap1qX5/fkPTvWink2BhAcgL5t8F7SGgGZ9sa8 6UGKnJoym0QRyVEhxBBRy9rFfZpFbnUnIGDXHH6VUNI/OAJxYokYqR4uTFgM/J11c3aP Vv5qF9kFwA+6Y37ypZop05pnR5FwASi/x6f0puycQOZuS5Nd/vKncITd/uJPoJOHondX bdKQ== 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=JTn7lZl1T4B/ILLIVfMdDo0g7+WeVfKhKYkSV8hbpC0=; b=dteOYl3tliZX8D4u+RIYVP2y8wP2+mdq8StFYlQhaPS7Du6naixm6gbrl3HeTo3L+I zHDfXx0JJzeAlZMBzdkDN+X20W0B1RV5p8966vaGZdkcppdf5o3GwmSo7NYeMRyJvjXA UIGUYnn++FQGwx0ip6KxLojo1R/mEYE+tWdN1g71jZxdT+YwLcuopLSTPDrh7ub5T45N sJINufXp+mYfs4dPpix1c3uEVZDOcewgIU7Gl+eLNGWyZuIrurFGpvK6eo7YNDLaOdm7 6oFSBfmtT3KuW4rtKRseiMQHiSyTtsIVnMRxBCk2XTF4aLOZoV4Ibzd9Q1uwVl6Qg37m 61xg== X-Gm-Message-State: APjAAAVVYo1IZ+UszO4yy+sDO+Tt4gTk1Z+NFF3it0JgNfcdyOegDKIV aB2sWCq5ETWl7gLgw7s/c3SS2uCd3co= X-Google-Smtp-Source: APXvYqzll/8grnmLbobYlqN0G2ltjgzemUliQ+pUyhsMADvwTl3ayuYPR5Ujn7rPKGpFshXxSmhyNw== X-Received: by 2002:adf:fb4a:: with SMTP id c10mr9507499wrs.309.1556477287423; Sun, 28 Apr 2019 11:48:07 -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.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Apr 2019 11:48:07 -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 12/13] net: dsa: b53: Use vlan_filtering property from dsa_switch Date: Sun, 28 Apr 2019 21:45:53 +0300 Message-Id: <20190428184554.9968-13-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 While possible (and safe) to use the newly introduced dsa_port_is_vlan_filtering helper, fabricating a dsa_port pointer is a bit awkward, so simply retrieve this from the dsa_switch structure. Signed-off-by: Vladimir Oltean Reviewed-by: Andrew Lunn --- drivers/net/dsa/b53/b53_common.c | 5 ++--- drivers/net/dsa/b53/b53_priv.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 9fbeb20ba263..c8040ecf4425 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c @@ -428,7 +428,6 @@ static void b53_enable_vlan(struct b53_device *dev, bool enable, b53_write8(dev, B53_CTRL_PAGE, B53_SWITCH_MODE, mgmt); dev->vlan_enabled = enable; - dev->vlan_filtering_enabled = enable_filtering; } static int b53_set_jumbo(struct b53_device *dev, bool enable, bool allow_10_100) @@ -665,7 +664,7 @@ int b53_configure_vlan(struct dsa_switch *ds) b53_do_vlan_op(dev, VTA_CMD_CLEAR); } - b53_enable_vlan(dev, false, dev->vlan_filtering_enabled); + b53_enable_vlan(dev, false, ds->vlan_filtering); b53_for_each_port(dev, i) b53_write16(dev, B53_VLAN_PAGE, @@ -1318,7 +1317,7 @@ int b53_vlan_prepare(struct dsa_switch *ds, int port, if (vlan->vid_end > dev->num_vlans) return -ERANGE; - b53_enable_vlan(dev, true, dev->vlan_filtering_enabled); + b53_enable_vlan(dev, true, ds->vlan_filtering); return 0; } diff --git a/drivers/net/dsa/b53/b53_priv.h b/drivers/net/dsa/b53/b53_priv.h index e3441dcf2d21..f25bc80c4ffc 100644 --- a/drivers/net/dsa/b53/b53_priv.h +++ b/drivers/net/dsa/b53/b53_priv.h @@ -139,7 +139,6 @@ struct b53_device { unsigned int num_vlans; struct b53_vlan *vlans; bool vlan_enabled; - bool vlan_filtering_enabled; unsigned int num_ports; struct b53_port *ports; };