From: Jason Gunthorpe <jgg@mellanox.com>
Date: Fri, 5 Jul 2019 13:16:19 +0000 (-0300)
Subject: Merge mlx5-next into rdma for-next
X-Git-Tag: v5.4-rc1~555^2~48
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5600a410ea24cb8467abdd4b8530961ff4f14907;p=platform%2Fkernel%2Flinux-rpi.git

Merge mlx5-next into rdma for-next

From git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux

Required for dependencies in the next patches.

* mlx5-next:
  net/mlx5: Add rts2rts_qp_counters_set_id field in hca cap
  net/mlx5: Properly name the generic WQE control field
  net/mlx5: Introduce TLS TX offload hardware bits and structures
  net/mlx5: Refactor mlx5_esw_query_functions for modularity
  net/mlx5: E-Switch prepare functions change handler to be modular
  net/mlx5: Introduce and use mlx5_eswitch_get_total_vports()
---

5600a410ea24cb8467abdd4b8530961ff4f14907
diff --cc include/linux/mlx5/eswitch.h
index 43fa5594,61db37a..46b5ba0
--- a/include/linux/mlx5/eswitch.h
+++ b/include/linux/mlx5/eswitch.h
@@@ -64,8 -64,10 +64,10 @@@ void *mlx5_eswitch_uplink_get_proto_dev
  u8 mlx5_eswitch_mode(struct mlx5_eswitch *esw);
  struct mlx5_flow_handle *
  mlx5_eswitch_add_send_to_vport_rule(struct mlx5_eswitch *esw,
 -				    int vport, u32 sqn);
 +				    u16 vport_num, u32 sqn);
  
+ u16 mlx5_eswitch_get_total_vports(const struct mlx5_core_dev *dev);
+ 
  #ifdef CONFIG_MLX5_ESWITCH
  enum devlink_eswitch_encap_mode
  mlx5_eswitch_get_encap_mode(const struct mlx5_core_dev *dev);