Skip to content

Commit 8eb301b

Browse files
Furong Xudavem330
authored andcommitted
net: stmmac: enable HW-accelerated VLAN stripping for gmac4 only
Commit 750011e ("net: stmmac: Add support for HW-accelerated VLAN stripping") enables MAC level VLAN tag stripping for all MAC cores, but leaves set_hw_vlan_mode() and rx_hw_vlan() un-implemented for both gmac and xgmac. On gmac and xgmac, ethtool reports rx-vlan-offload is on, both MAC and driver do nothing about VLAN packets actually, although VLAN works well. Driver level stripping should be used on gmac and xgmac for now. Fixes: 750011e ("net: stmmac: Add support for HW-accelerated VLAN stripping") Signed-off-by: Furong Xu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent e15a5d8 commit 8eb301b

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7662,9 +7662,10 @@ int stmmac_dvr_probe(struct device *device,
76627662
#ifdef STMMAC_VLAN_TAG_USED
76637663
/* Both mac100 and gmac support receive VLAN tag detection */
76647664
ndev->features |= NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_HW_VLAN_STAG_RX;
7665-
ndev->hw_features |= NETIF_F_HW_VLAN_CTAG_RX;
7666-
priv->hw->hw_vlan_en = true;
7667-
7665+
if (priv->plat->has_gmac4) {
7666+
ndev->hw_features |= NETIF_F_HW_VLAN_CTAG_RX;
7667+
priv->hw->hw_vlan_en = true;
7668+
}
76687669
if (priv->dma_cap.vlhash) {
76697670
ndev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
76707671
ndev->features |= NETIF_F_HW_VLAN_STAG_FILTER;

0 commit comments

Comments
 (0)