diff options
| author | David Bauer <mail@david-bauer.net> | 2020-12-01 18:55:27 +0100 |
|---|---|---|
| committer | David Bauer <mail@david-bauer.net> | 2020-12-14 01:13:30 +0100 |
| commit | cdc8d4b46f0811292fffc6094acd81e854b5f4a5 (patch) | |
| tree | 90874d27b74c9717049dfdac875696ad1900bcc8 /target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma | |
| parent | 116191eddf9d8ddba61de788824dea442b265936 (diff) | |
| download | upstream-cdc8d4b46f0811292fffc6094acd81e854b5f4a5.tar.gz upstream-cdc8d4b46f0811292fffc6094acd81e854b5f4a5.tar.bz2 upstream-cdc8d4b46f0811292fffc6094acd81e854b5f4a5.zip | |
ipq40xx: revert usage of VLAN S-TAG
This reverts the usage of the S-Tag for separating LAN and WAN port on
the embedded switch. Many users complained about not being able to
manage C-Tag addition / removal on the switch as well as degraded
performance.
Fixes: commit 9da2b567605b ("ipq40xx: fix ethernet vlan double tagging")
Signed-off-by: David Bauer <mail@david-bauer.net>
Diffstat (limited to 'target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma')
| -rw-r--r-- | target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma_axi.c | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma_axi.c b/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma_axi.c index 49ee31a1bd..68718de9f4 100644 --- a/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma_axi.c +++ b/target/linux/ipq40xx/files/drivers/net/ethernet/qualcomm/essedma/edma_axi.c @@ -969,7 +969,7 @@ static int edma_axi_probe(struct platform_device *pdev) edma_netdev[i]->max_mtu = 9000; edma_netdev[i]->features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_SG | - NETIF_F_TSO | NETIF_F_GRO; + NETIF_F_TSO | NETIF_F_GRO | NETIF_F_HW_VLAN_CTAG_TX; edma_netdev[i]->hw_features = NETIF_F_HW_CSUM | NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_SG | NETIF_F_TSO | NETIF_F_GRO; @@ -978,20 +978,11 @@ static int edma_axi_probe(struct platform_device *pdev) edma_netdev[i]->wanted_features = NETIF_F_HW_CSUM | NETIF_F_SG | NETIF_F_TSO | NETIF_F_GRO; - if (of_property_read_bool(np, "qcom,single-phy") && edma_cinfo->num_gmac == 1) - edma_netdev[i]->features |= NETIF_F_HW_VLAN_CTAG_TX; - #ifdef CONFIG_RFS_ACCEL - 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; - if (of_property_read_bool(np, "qcom,single-phy") && edma_cinfo->num_gmac == 1) { - edma_netdev[i]->features |= NETIF_F_RXHASH; - edma_netdev[i]->hw_features |= NETIF_F_RXHASH; - edma_netdev[i]->vlan_features |= NETIF_F_RXHASH; - edma_netdev[i]->wanted_features |= NETIF_F_RXHASH; - } + edma_netdev[i]->features |= NETIF_F_NTUPLE | NETIF_F_RXHASH; + edma_netdev[i]->hw_features |= NETIF_F_NTUPLE | NETIF_F_RXHASH; + edma_netdev[i]->vlan_features |= NETIF_F_NTUPLE | NETIF_F_RXHASH; + edma_netdev[i]->wanted_features |= NETIF_F_NTUPLE | NETIF_F_RXHASH; #endif edma_set_ethtool_ops(edma_netdev[i]); |