lkml.org 
[lkml]   [2021]   [Aug]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 080/104] net/mlx5e: Add NETIF_F_HW_TC to hw_features when HTB offload is available
    Date
    From: Maxim Mikityanskiy <maximmi@nvidia.com>

    [ Upstream commit 9841d58f3550d11c6181424427e8ad8c9c80f1b6 ]

    If a feature flag is only present in features, but not in hw_features,
    the user can't reset it. Although hw_features may contain NETIF_F_HW_TC
    by the point where the driver checks whether HTB offload is supported,
    this flag is controlled by another condition that may not hold. Set it
    explicitly to make sure the user can disable it.

    Fixes: 214baf22870c ("net/mlx5e: Support HTB offload")
    Signed-off-by: Maxim Mikityanskiy <maximmi@nvidia.com>
    Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
    Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
    index 86a27b0b42cb..d0d9acb17253 100644
    --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
    @@ -4866,6 +4866,9 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev)
    if (MLX5_CAP_ETH(mdev, scatter_fcs))
    netdev->hw_features |= NETIF_F_RXFCS;

    + if (mlx5_qos_is_supported(mdev))
    + netdev->hw_features |= NETIF_F_HW_TC;
    +
    netdev->features = netdev->hw_features;

    /* Defaults */
    @@ -4886,8 +4889,6 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev)
    netdev->hw_features |= NETIF_F_NTUPLE;
    #endif
    }
    - if (mlx5_qos_is_supported(mdev))
    - netdev->features |= NETIF_F_HW_TC;

    netdev->features |= NETIF_F_HIGHDMA;
    netdev->features |= NETIF_F_HW_VLAN_STAG_FILTER;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-08-02 16:16    [W:4.195 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site