Message ID | 20230325164053.hiwjuxksscjm3ov4@Svens-MacBookPro.local (mailing list archive) |
---|---|
State | Accepted |
Commit | a587a84813b90372cb0a7565e201a4075da67919 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | net: mvpp2: rss fixes | expand |
sob., 25 mar 2023 o 17:40 Sven Auhagen <sven.auhagen@voleatech.de> napisał(a): > > The mvpp2 parser entry for QinQ has the inner and outer VLAN > in the wrong order. > Fix the problem by swapping them. > > Fixes: 3f518509dedc ("ethernet: Add new driver for Marvell Armada 375 network unit") > Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de> > --- > > Change from v2: > * Formal fixes > > Change from v1: > * Added the fixes tag > > diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c > index 75ba57bd1d46..ed8be396428b 100644 > --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c > +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c > @@ -1539,8 +1539,8 @@ static int mvpp2_prs_vlan_init(struct platform_device *pdev, struct mvpp2 *priv) > if (!priv->prs_double_vlans) > return -ENOMEM; > > - /* Double VLAN: 0x8100, 0x88A8 */ > - err = mvpp2_prs_double_vlan_add(priv, ETH_P_8021Q, ETH_P_8021AD, > + /* Double VLAN: 0x88A8, 0x8100 */ > + err = mvpp2_prs_double_vlan_add(priv, ETH_P_8021AD, ETH_P_8021Q, > MVPP2_PRS_PORT_MASK); > if (err) > return err; > -- > 2.33.1 > Reviewed-by: Marcin Wojtas <mw@semihalf.com> Thanks, Marcin
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c index 75ba57bd1d46..ed8be396428b 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c @@ -1539,8 +1539,8 @@ static int mvpp2_prs_vlan_init(struct platform_device *pdev, struct mvpp2 *priv) if (!priv->prs_double_vlans) return -ENOMEM; - /* Double VLAN: 0x8100, 0x88A8 */ - err = mvpp2_prs_double_vlan_add(priv, ETH_P_8021Q, ETH_P_8021AD, + /* Double VLAN: 0x88A8, 0x8100 */ + err = mvpp2_prs_double_vlan_add(priv, ETH_P_8021AD, ETH_P_8021Q, MVPP2_PRS_PORT_MASK); if (err) return err;
The mvpp2 parser entry for QinQ has the inner and outer VLAN in the wrong order. Fix the problem by swapping them. Fixes: 3f518509dedc ("ethernet: Add new driver for Marvell Armada 375 network unit") Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de> --- Change from v2: * Formal fixes Change from v1: * Added the fixes tag