From 9da2b567605b0964d921b9ca4f0c9886db4f636d Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 14 Jul 2020 10:07:32 +0200 Subject: ipq40xx: fix ethernet vlan double tagging As the the SoC uses implicit vlan tagging for dual MAC support, the offload feature breaks when using double tagging. Signed-off-by: Sven Eckelmann Signed-off-by: John Crispin --- .../files-5.4/drivers/net/ethernet/qualcomm/essedma/edma_axi.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'target/linux/ipq40xx/files-5.4') diff --git a/target/linux/ipq40xx/files-5.4/drivers/net/ethernet/qualcomm/essedma/edma_axi.c b/target/linux/ipq40xx/files-5.4/drivers/net/ethernet/qualcomm/essedma/edma_axi.c index 96a82b3116..50335b0d14 100644 --- a/target/linux/ipq40xx/files-5.4/drivers/net/ethernet/qualcomm/essedma/edma_axi.c +++ b/target/linux/ipq40xx/files-5.4/drivers/net/ethernet/qualcomm/essedma/edma_axi.c @@ -968,7 +968,6 @@ static int edma_axi_probe(struct platform_device *pdev) edma_netdev[i]->netdev_ops = &edma_axi_netdev_ops; edma_netdev[i]->max_mtu = 9000; edma_netdev[i]->features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM - | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_SG | NETIF_F_TSO | NETIF_F_GRO; edma_netdev[i]->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM | @@ -980,10 +979,10 @@ static int edma_axi_probe(struct platform_device *pdev) NETIF_F_TSO | NETIF_F_GRO; #ifdef CONFIG_RFS_ACCEL - edma_netdev[i]->features |= NETIF_F_RXHASH | NETIF_F_NTUPLE; - edma_netdev[i]->hw_features |= NETIF_F_RXHASH | NETIF_F_NTUPLE; - edma_netdev[i]->vlan_features |= NETIF_F_RXHASH | NETIF_F_NTUPLE; - edma_netdev[i]->wanted_features |= NETIF_F_RXHASH | NETIF_F_NTUPLE; + edma_netdev[i]->features |= NETIF_F_NTUPLE; + edma_netdev[i]->hw_features |= NETIF_F_NTUPLE; + edma_netdev[i]->vlan_features |= NETIF_F_NTUPLE; + edma_netdev[i]->wanted_features |= NETIF_F_NTUPLE; #endif edma_set_ethtool_ops(edma_netdev[i]); -- cgit v1.2.3