net: stmmac: propagate feature flags to vlan
authorCorinna Vinschen <vinschen@redhat.com>
Mon, 17 Apr 2023 19:28:45 +0000 (21:28 +0200)
committerJakub Kicinski <kuba@kernel.org>
Wed, 19 Apr 2023 04:13:13 +0000 (21:13 -0700)
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 <vinschen@redhat.com>
Link: https://lore.kernel.org/r/20230417192845.590034-1-vinschen@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

index c0e90fd..5280256 100644 (file)
@@ -7313,6 +7313,10 @@ int stmmac_dvr_probe(struct device *device,
        if (priv->dma_cap.rssen && priv->plat->rss_en)
                ndev->features |= NETIF_F_RXHASH;
 
+       ndev->vlan_features |= ndev->features;
+       /* TSO doesn't work on VLANs yet */
+       ndev->vlan_features &= ~NETIF_F_TSO;
+
        /* MTU range: 46 - hw-specific max */
        ndev->min_mtu = ETH_ZLEN - ETH_HLEN;
        if (priv->plat->has_xgmac)