Commit 0dce6847 authored Jul 17, 2025 by Jakub Kicinski

Merge branch 'net-mlx5-misc-changes-2025-07-16'

Tariq Toukan says:

====================
net/mlx5: misc changes 2025-07-16

This series contains misc enhancements to the mlx5 driver.

v1: https://lore.kernel.org/1752471585-18053-1-git-send-email-tariqt@nvidia.com
====================

Link: https://patch.msgid.link/1752675472-201445-1-git-send-email-tariqt@nvidia.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents 2b0ba7b5 2a601b2d

drivers/net/ethernet/mellanox/mlx5/core/en/qos.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -374,7 +374,7 @@ void mlx5e_reactivate_qos_sq(struct mlx5e_priv *priv, u16 qid, struct netdev_que
		void mlx5e_reset_qdisc(struct net_device *dev, u16 qid)
		{
		struct netdev_queue *dev_queue = netdev_get_tx_queue(dev, qid);
		struct Qdisc *qdisc = dev_queue->qdisc_sleeping;
		struct Qdisc *qdisc = rtnl_dereference(dev_queue->qdisc_sleeping);

		if (!qdisc)
		return;

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -42,8 +42,7 @@ u32 mlx5_ipsec_device_caps(struct mlx5_core_dev *mdev)

		if (MLX5_CAP_IPSEC(mdev, ipsec_full_offload) &&
		(mdev->priv.steering->mode == MLX5_FLOW_STEERING_MODE_DMFS \|\|
		(mdev->priv.steering->mode == MLX5_FLOW_STEERING_MODE_SMFS &&
		is_mdev_legacy_mode(mdev)))) {
		is_mdev_legacy_mode(mdev))) {
		if (MLX5_CAP_FLOWTABLE_NIC_TX(mdev,
		reformat_add_esp_trasport) &&
		MLX5_CAP_FLOWTABLE_NIC_RX(mdev,

drivers/net/ethernet/mellanox/mlx5/core/eswitch.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -827,7 +827,7 @@ void mlx5_esw_vport_vhca_id_clear(struct mlx5_eswitch *esw, u16 vport_num);
		int mlx5_eswitch_vhca_id_to_vport(struct mlx5_eswitch esw, u16 vhca_id, u16 vport_num);

		/**
		* mlx5_esw_event_info - Indicates eswitch mode changed/changing.
		* struct mlx5_esw_event_info - Indicates eswitch mode changed/changing.
		*
		* @new_mode: New mode of eswitch.
		*/