mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 18:09:56 +00:00
net/mlx5e: Fix VXLAN configuration restore after function reload
[ Upstream commitb3c2ed21c0] When detaching netdev, remove vxlan port configuration using udp_tunnel_drop_rx_info. During function reload, configuration will be restored using udp_tunnel_get_rx_info. This ensures sync between firmware and driver. Use udp_tunnel_get_rx_info even if its physical interface is down. Fixes:4383cfcc65("net/mlx5: Add devlink reload") Signed-off-by: Aya Levin <ayal@mellanox.com> Reviewed-by: Eran Ben Elisha <eranbe@mellanox.com> Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
d8e284d778
commit
1c15471511
@@ -3076,9 +3076,6 @@ int mlx5e_open(struct net_device *netdev)
|
|||||||
mlx5_set_port_admin_status(priv->mdev, MLX5_PORT_UP);
|
mlx5_set_port_admin_status(priv->mdev, MLX5_PORT_UP);
|
||||||
mutex_unlock(&priv->state_lock);
|
mutex_unlock(&priv->state_lock);
|
||||||
|
|
||||||
if (mlx5_vxlan_allowed(priv->mdev->vxlan))
|
|
||||||
udp_tunnel_get_rx_info(netdev);
|
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5207,6 +5204,8 @@ static void mlx5e_nic_enable(struct mlx5e_priv *priv)
|
|||||||
rtnl_lock();
|
rtnl_lock();
|
||||||
if (netif_running(netdev))
|
if (netif_running(netdev))
|
||||||
mlx5e_open(netdev);
|
mlx5e_open(netdev);
|
||||||
|
if (mlx5_vxlan_allowed(priv->mdev->vxlan))
|
||||||
|
udp_tunnel_get_rx_info(netdev);
|
||||||
netif_device_attach(netdev);
|
netif_device_attach(netdev);
|
||||||
rtnl_unlock();
|
rtnl_unlock();
|
||||||
}
|
}
|
||||||
@@ -5223,6 +5222,8 @@ static void mlx5e_nic_disable(struct mlx5e_priv *priv)
|
|||||||
rtnl_lock();
|
rtnl_lock();
|
||||||
if (netif_running(priv->netdev))
|
if (netif_running(priv->netdev))
|
||||||
mlx5e_close(priv->netdev);
|
mlx5e_close(priv->netdev);
|
||||||
|
if (mlx5_vxlan_allowed(priv->mdev->vxlan))
|
||||||
|
udp_tunnel_drop_rx_info(priv->netdev);
|
||||||
netif_device_detach(priv->netdev);
|
netif_device_detach(priv->netdev);
|
||||||
rtnl_unlock();
|
rtnl_unlock();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user