Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[linux-2.6-microblaze.git] / include / linux / mlx5 / driver.h

diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 0c2993c..f8e8d7e 100644 (file)
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -127,6 +127,7 @@ enum {
        MLX5_REG_PELC            = 0x500e,
        MLX5_REG_PVLC            = 0x500f,
        MLX5_REG_PCMR            = 0x5041,
+       MLX5_REG_PDDR            = 0x5031,
        MLX5_REG_PMLP            = 0x5002,
        MLX5_REG_PPLM            = 0x5023,
        MLX5_REG_PCAM            = 0x507f,
@@ -516,8 +517,8 @@ struct mlx5_rate_limit {
 
 struct mlx5_rl_entry {
        u8 rl_raw[MLX5_ST_SZ_BYTES(set_pp_rate_limit_context)];
-       u16 index;
        u64 refcount;
+       u16 index;
        u16 uid;
        u8 dedicated : 1;
 };
@@ -529,6 +530,7 @@ struct mlx5_rl_table {
        u32                     max_rate;
        u32                     min_rate;
        struct mlx5_rl_entry   *rl_entry;
+       u64 refcount;
 };
 
 struct mlx5_core_roce {
@@ -643,10 +645,14 @@ struct mlx5_td {
 };
 
 struct mlx5e_resources {
-       u32                        pdn;
-       struct mlx5_td             td;
-       struct mlx5_core_mkey      mkey;
-       struct mlx5_sq_bfreg       bfreg;
+       struct mlx5e_hw_objs {
+               u32                        pdn;
+               struct mlx5_td             td;
+               struct mlx5_core_mkey      mkey;
+               struct mlx5_sq_bfreg       bfreg;
+       } hw_objs;
+       struct devlink_port dl_port;
+       struct net_device *uplink_netdev;
 };
 
 enum mlx5_sw_icm_type {