Skip to content

Commit 6b2c6e4

Browse files
github-cygwinkuba-moo
authored andcommitted
net: stmmac: propagate feature flags to vlan
stmmac_dev_probe doesn't propagate feature flags to VLANs. So features like offloading don't correspond with the general features and it's not possible to manipulate features via ethtool -K to affect VLANs. Propagate feature flags to vlan features. Drop TSO feature because it does not work on VLANs yet. Signed-off-by: Corinna Vinschen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 980f079 commit 6b2c6e4

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7313,6 +7313,10 @@ int stmmac_dvr_probe(struct device *device,
73137313
if (priv->dma_cap.rssen && priv->plat->rss_en)
73147314
ndev->features |= NETIF_F_RXHASH;
73157315

7316+
ndev->vlan_features |= ndev->features;
7317+
/* TSO doesn't work on VLANs yet */
7318+
ndev->vlan_features &= ~NETIF_F_TSO;
7319+
73167320
/* MTU range: 46 - hw-specific max */
73177321
ndev->min_mtu = ETH_ZLEN - ETH_HLEN;
73187322
if (priv->plat->has_xgmac)

0 commit comments

Comments
 (0)