| Message ID | YzBp+Kk04CFDys4L@makrotopia.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | fb7da771bc43d004bc150101a12a2b245b3ba6dc |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [1/2] net: ethernet: mtk_eth_soc: fix wrong use of new helper function | expand |
> In function mtk_foe_entry_set_vlan() the call to field accessor macro > FIELD_GET(MTK_FOE_IB1_BIND_VLAN_LAYER, entry->ib1) > has been wrongly replaced by > mtk_prep_ib1_vlan_layer(eth, entry->ib1) > > Use correct helper function mtk_get_ib1_vlan_layer instead. Acked-by: Lorenzo Bianconi <lorenzo@kernel.org> > > Reported-by: Chen Minqiang <ptpt52@gmail.com> > Fixes: 03a3180e5c09e1 ("net: ethernet: mtk_eth_soc: introduce flow offloading support for mt7986") > Signed-off-by: Daniel Golle <daniel@makrotopia.org> > --- > drivers/net/ethernet/mediatek/mtk_ppe.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.c b/drivers/net/ethernet/mediatek/mtk_ppe.c > index 25f8738a062bd0..4ea2b342f252ac 100644 > --- a/drivers/net/ethernet/mediatek/mtk_ppe.c > +++ b/drivers/net/ethernet/mediatek/mtk_ppe.c > @@ -337,7 +337,7 @@ int mtk_foe_entry_set_vlan(struct mtk_eth *eth, struct mtk_foe_entry *entry, > { > struct mtk_foe_mac_info *l2 = mtk_foe_entry_l2(eth, entry); > > - switch (mtk_prep_ib1_vlan_layer(eth, entry->ib1)) { > + switch (mtk_get_ib1_vlan_layer(eth, entry->ib1)) { > case 0: > entry->ib1 |= mtk_get_ib1_vlan_tag_mask(eth) | > mtk_prep_ib1_vlan_layer(eth, 1); > -- > 2.37.3 >
Hello: This series was applied to netdev/net-next.git (master) by Jakub Kicinski <kuba@kernel.org>: On Sun, 25 Sep 2022 15:47:20 +0100 you wrote: > In function mtk_foe_entry_set_vlan() the call to field accessor macro > FIELD_GET(MTK_FOE_IB1_BIND_VLAN_LAYER, entry->ib1) > has been wrongly replaced by > mtk_prep_ib1_vlan_layer(eth, entry->ib1) > > Use correct helper function mtk_get_ib1_vlan_layer instead. > > [...] Here is the summary with links: - [1/2] net: ethernet: mtk_eth_soc: fix wrong use of new helper function https://git.kernel.org/netdev/net-next/c/fb7da771bc43 - [2/2] net: ethernet: mtk_eth_soc: fix usage of foe_entry_size https://git.kernel.org/netdev/net-next/c/454b20e19322 You are awesome, thank you!
diff --git a/drivers/net/ethernet/mediatek/mtk_ppe.c b/drivers/net/ethernet/mediatek/mtk_ppe.c index 25f8738a062bd0..4ea2b342f252ac 100644 --- a/drivers/net/ethernet/mediatek/mtk_ppe.c +++ b/drivers/net/ethernet/mediatek/mtk_ppe.c @@ -337,7 +337,7 @@ int mtk_foe_entry_set_vlan(struct mtk_eth *eth, struct mtk_foe_entry *entry, { struct mtk_foe_mac_info *l2 = mtk_foe_entry_l2(eth, entry); - switch (mtk_prep_ib1_vlan_layer(eth, entry->ib1)) { + switch (mtk_get_ib1_vlan_layer(eth, entry->ib1)) { case 0: entry->ib1 |= mtk_get_ib1_vlan_tag_mask(eth) | mtk_prep_ib1_vlan_layer(eth, 1);
In function mtk_foe_entry_set_vlan() the call to field accessor macro FIELD_GET(MTK_FOE_IB1_BIND_VLAN_LAYER, entry->ib1) has been wrongly replaced by mtk_prep_ib1_vlan_layer(eth, entry->ib1) Use correct helper function mtk_get_ib1_vlan_layer instead. Reported-by: Chen Minqiang <ptpt52@gmail.com> Fixes: 03a3180e5c09e1 ("net: ethernet: mtk_eth_soc: introduce flow offloading support for mt7986") Signed-off-by: Daniel Golle <daniel@makrotopia.org> --- drivers/net/ethernet/mediatek/mtk_ppe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)