| Message ID | 20230417192845.590034-1-vinschen@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6b2c6e4a938fece9b539c8085f21d17c5e6eb9de |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2,net-next] net: stmmac: propagate feature flags to vlan | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 17 Apr 2023 21:28:45 +0200 you wrote: > 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. > > [...] Here is the summary with links: - [v2,net-next] net: stmmac: propagate feature flags to vlan https://git.kernel.org/netdev/net-next/c/6b2c6e4a938f You are awesome, thank you!
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index d7fcab057032..8ab67c020a08 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -7253,6 +7253,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)
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> --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++++ 1 file changed, 4 insertions(+)