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 3/4] net: dsa: Obtain VLAN protocol from
 skb->protocol
Thread-Topic: [PATCH net-next 3/4] net: dsa: Obtain VLAN protocol from
 skb->protocol
Thread-Index: AQHWmGW14uicr7mTFkCTbmtHLSILh6mD/rkA
Date:   Fri, 2 Oct 2020 08:41:03 +0000
Message-ID: <20201002084102.sf7w5d76lf2swatq@skbuf>
References: <20201002024215.660240-1-f.fainelli@gmail.com>
 <20201002024215.660240-4-f.fainelli@gmail.com>
In-Reply-To: <20201002024215.660240-4-f.fainelli@gmail.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-ID: <A3912E8E4560C2459BD92D285D3D6F0C@eurprd04.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: d0a87c55-3121-44cb-035f-08d866aee5f5
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Oct 2020 08:41:04.0168
 (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: G1m/CU72HzAOvI0DbSq7lUbdWQKJ+uVyGEMDN7DNdHiEOUiibVhowSIl0JBztl7Ar06337wmbn+rFzyOsHfEKw==
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:14PM -0700, Florian Fainelli wrote:
> Now that dsa_untag_bridge_pvid() is called after eth_type_trans() we are
> guaranteed that skb->protocol will be set to a correct value, thus
> allowing us to avoid calling vlan_eth_hdr().
>=20
> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
> ---

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

>  net/dsa/dsa_priv.h | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>=20
> diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
> index 0348dbab4131..d6ce8c2a2590 100644
> --- a/net/dsa/dsa_priv.h
> +++ b/net/dsa/dsa_priv.h
> @@ -201,7 +201,6 @@ dsa_slave_to_master(const struct net_device *dev)
>  static inline struct sk_buff *dsa_untag_bridge_pvid(struct sk_buff *skb)
>  {
>  	struct dsa_port *dp =3D dsa_slave_to_port(skb->dev);
> -	struct vlan_ethhdr *hdr =3D vlan_eth_hdr(skb);
>  	struct net_device *br =3D dp->bridge_dev;
>  	struct net_device *dev =3D skb->dev;
>  	struct net_device *upper_dev;
> @@ -217,7 +216,7 @@ static inline struct sk_buff *dsa_untag_bridge_pvid(s=
truct sk_buff *skb)
>  		return skb;
> =20
>  	/* Move VLAN tag from data to hwaccel */
> -	if (!skb_vlan_tag_present(skb) && hdr->h_vlan_proto =3D=3D htons(proto)=
) {
> +	if (!skb_vlan_tag_present(skb) && skb->protocol =3D=3D htons(proto)) {
>  		skb =3D skb_vlan_untag(skb);
>  		if (!skb)
>  			return NULL;
> --=20
> 2.25.1
> =