Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Vladimir Oltean <vladimir.oltean@nxp.com>
To:     Florian Fainelli <f.fainelli@gmail.com>
CC:     "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        Andrew Lunn <andrew@lunn.ch>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        open list <linux-kernel@vger.kernel.org>,
        "olteanv@gmail.com" <olteanv@gmail.com>
Subject: Re: [PATCH net-next 2/4] net: dsa: b53: Set untag_bridge_pvid
Thread-Topic: [PATCH net-next 2/4] net: dsa: b53: Set untag_bridge_pvid
Thread-Index: AQHWmGWxYmDACdGIjU6cTFofEHbQtqmD/piA
Date:   Fri, 2 Oct 2020 08:40:35 +0000
Message-ID: <20201002084035.zrqge6qy43xhce7a@skbuf>
References: <20201002024215.660240-1-f.fainelli@gmail.com>
 <20201002024215.660240-3-f.fainelli@gmail.com>
In-Reply-To: <20201002024215.660240-3-f.fainelli@gmail.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-ID: <BA7204E3DE08724F9FB192AD767726AF@eurprd04.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 6a606fbb-5476-43c8-0f81-08d866aed51b
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Oct 2020 08:40:35.7159
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 8s7DNDKNyXKywN9g9swa5VQkz4zfOt4TPB44ISoa4UJdA3PpyEFYLEqGVMQZez7N+4tANs47LLaBsaL4NOcu0Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3615
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Oct 01, 2020 at 07:42:13PM -0700, Florian Fainelli wrote:
> Indicate to the DSA receive path that we need to untage the bridge PVID,
> this allows us to remove the dsa_untag_bridge_pvid() calls from
> net/dsa/tag_brcm.c.
>=20
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---

Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>

>  drivers/net/dsa/b53/b53_common.c |  1 +
>  net/dsa/tag_brcm.c               | 15 ++-------------
>  2 files changed, 3 insertions(+), 13 deletions(-)
>=20
> diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_c=
ommon.c
> index 73507cff3bc4..ce18ba0b74eb 100644
> --- a/drivers/net/dsa/b53/b53_common.c
> +++ b/drivers/net/dsa/b53/b53_common.c
> @@ -2603,6 +2603,7 @@ struct b53_device *b53_switch_alloc(struct device *=
base,
>  	dev->ops =3D ops;
>  	ds->ops =3D &b53_switch_ops;
>  	ds->configure_vlan_while_not_filtering =3D true;
> +	ds->untag_bridge_pvid =3D true;
>  	dev->vlan_enabled =3D ds->configure_vlan_while_not_filtering;
>  	mutex_init(&dev->reg_mutex);
>  	mutex_init(&dev->stats_mutex);
> diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c
> index 69d6b8c597a9..ad72dff8d524 100644
> --- a/net/dsa/tag_brcm.c
> +++ b/net/dsa/tag_brcm.c
> @@ -152,11 +152,6 @@ static struct sk_buff *brcm_tag_rcv_ll(struct sk_buf=
f *skb,
>  	/* Remove Broadcom tag and update checksum */
>  	skb_pull_rcsum(skb, BRCM_TAG_LEN);
> =20
> -	/* Set the MAC header to where it should point for
> -	 * dsa_untag_bridge_pvid() to parse the correct VLAN header.
> -	 */
> -	skb_set_mac_header(skb, -ETH_HLEN);
> -
>  	skb->offload_fwd_mark =3D 1;
> =20
>  	return skb;
> @@ -187,7 +182,7 @@ static struct sk_buff *brcm_tag_rcv(struct sk_buff *s=
kb, struct net_device *dev,
>  		nskb->data - ETH_HLEN - BRCM_TAG_LEN,
>  		2 * ETH_ALEN);
> =20
> -	return dsa_untag_bridge_pvid(nskb);
> +	return nskb;
>  }
> =20
>  static const struct dsa_device_ops brcm_netdev_ops =3D {
> @@ -214,14 +209,8 @@ static struct sk_buff *brcm_tag_rcv_prepend(struct s=
k_buff *skb,
>  					    struct net_device *dev,
>  					    struct packet_type *pt)
>  {
> -	struct sk_buff *nskb;
> -
>  	/* tag is prepended to the packet */
> -	nskb =3D brcm_tag_rcv_ll(skb, dev, pt, ETH_HLEN);
> -	if (!nskb)
> -		return nskb;
> -
> -	return dsa_untag_bridge_pvid(nskb);
> +	return brcm_tag_rcv_ll(skb, dev, pt, ETH_HLEN);
>  }
> =20
>  static const struct dsa_device_ops brcm_prepend_netdev_ops =3D {
> --=20
> 2.25.1
> =