lkml.org 
[lkml]   [2021]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 033/178] net/mlx5e: Remove dependency in IPsec initialization flows
    Date
    From: Huy Nguyen <huyn@nvidia.com>

    [ Upstream commit 8ad893e516a77209a1818a2072d2027d87db809f ]

    Currently, IPsec feature is disabled because mlx5e_build_nic_netdev
    is required to be called after mlx5e_ipsec_init. This requirement is
    invalid as mlx5e_build_nic_netdev and mlx5e_ipsec_init initialize
    independent resources.

    Remove ipsec pointer check in mlx5e_build_nic_netdev so that the
    two functions can be called at any order.

    Fixes: 547eede070eb ("net/mlx5e: IPSec, Innova IPSec offload infrastructure")
    Signed-off-by: Huy Nguyen <huyn@nvidia.com>
    Reviewed-by: Raed Salem <raeds@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_accel/ipsec.c | 3 ---
    1 file changed, 3 deletions(-)

    diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
    index 3d45341e2216..26f7fab109d9 100644
    --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
    +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
    @@ -532,9 +532,6 @@ void mlx5e_ipsec_build_netdev(struct mlx5e_priv *priv)
    struct mlx5_core_dev *mdev = priv->mdev;
    struct net_device *netdev = priv->netdev;

    - if (!priv->ipsec)
    - return;
    -
    if (!(mlx5_accel_ipsec_device_caps(mdev) & MLX5_ACCEL_IPSEC_CAP_ESP) ||
    !MLX5_CAP_ETH(mdev, swp)) {
    mlx5_core_dbg(mdev, "mlx5e: ESP and SWP offload not supported\n");
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-06-21 18:39    [W:4.112 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site