Commit bbe37139 authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

Merge branch 'mlx5-next' into wip/leon-for-next 

* mlx5-next:
  net/mlx5: Introduce other vport query for Q-counters
parents d54bd5ab 77f7eb9f

include/linux/mlx5/mlx5_ifc.h

+10 −3
Original line number Diff line number Diff line
@@ -1729,7 +1729,9 @@ struct mlx5_ifc_cmd_hca_cap_bits { 
	u8         log_max_transport_domain[0x5];

	u8         reserved_at_328[0x3];

	u8         log_max_pd[0x5];

	u8         reserved_at_330[0xb];

	u8         reserved_at_330[0x9];

	u8         q_counter_aggregation[0x1];

	u8         q_counter_other_vport[0x1];

	u8         log_max_xrcd[0x5];



	u8         nic_receive_steering_discard[0x1];
@@ -5603,10 +5605,15 @@ struct mlx5_ifc_query_q_counter_in_bits { 
	u8         reserved_at_20[0x10];

	u8         op_mod[0x10];



	u8         reserved_at_40[0x80];

	u8         other_vport[0x1];

	u8         reserved_at_41[0xf];

	u8         vport_number[0x10];



	u8         reserved_at_60[0x60];



	u8         clear[0x1];

	u8         reserved_at_c1[0x1f];

	u8         aggregate[0x1];

	u8         reserved_at_c2[0x1e];



	u8         reserved_at_e0[0x18];

	u8         counter_set_id[0x8];