Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+3
-4
+1
-1
drivers/net/ethernet/mellanox/mlx5/core/en/qos.c
+1
-1
drivers/net/ethernet/mellanox/mlx5/core/en/qos.c
···
374
374
void mlx5e_reset_qdisc(struct net_device *dev, u16 qid)
375
375
{
376
376
struct netdev_queue *dev_queue = netdev_get_tx_queue(dev, qid);
377
-
struct Qdisc *qdisc = dev_queue->qdisc_sleeping;
377
+
struct Qdisc *qdisc = rtnl_dereference(dev_queue->qdisc_sleeping);
378
378
379
379
if (!qdisc)
380
380
return;
+1
-2
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c
+1
-2
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_offload.c
···
42
42
43
43
if (MLX5_CAP_IPSEC(mdev, ipsec_full_offload) &&
44
44
(mdev->priv.steering->mode == MLX5_FLOW_STEERING_MODE_DMFS ||
45
-
(mdev->priv.steering->mode == MLX5_FLOW_STEERING_MODE_SMFS &&
46
-
is_mdev_legacy_mode(mdev)))) {
45
+
is_mdev_legacy_mode(mdev))) {
47
46
if (MLX5_CAP_FLOWTABLE_NIC_TX(mdev,
48
47
reformat_add_esp_trasport) &&
49
48
MLX5_CAP_FLOWTABLE_NIC_RX(mdev,
+1
-1
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+1
-1
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
···
827
827
int mlx5_eswitch_vhca_id_to_vport(struct mlx5_eswitch *esw, u16 vhca_id, u16 *vport_num);
828
828
829
829
/**
830
-
* mlx5_esw_event_info - Indicates eswitch mode changed/changing.
830
+
* struct mlx5_esw_event_info - Indicates eswitch mode changed/changing.
831
831
*
832
832
* @new_mode: New mode of eswitch.
833
833
*/