aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <[email protected]>2020-02-19 10:44:25 -0800
committerDavid S. Miller <[email protected]>2020-02-19 10:44:25 -0800
commitd631f96dec471fd5f21e8ddeabc520e9259b095f (patch)
tree313b4fe0de293979ef5263ff7625ad776b46e8f6 /include/linux
parent00796b929ce8c9e7567fe7e395763418eb579100 (diff)
parent0120936a9fc7493fed63588204af427dcf00feea (diff)
Merge tag 'mlx5-updates-2020-01-24' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says: ==================== This series adds two moderate updates and some misc small patches to mlx5 driver. 1) From Aya, Add the missing devlink health dump callbacks support for both rx and tx health reporters. First patch of the series is extending devlink API to set binary fmsg data. All others patches in the series are adding the mlx5 devlink health callbacks support and the needed FW commands. 2) Also from Aya, Support for FEC modes based on 50G per lane links. Part of this series, Aya adds one missing link mode define "FEC_LLRS" to include/uapi/linux/ethtool.h. 3) From Joe, Use proper logging and tracing line terminations 4) From Christophe, Remove a useless 'drain_workqueue()' ==================== Signed-off-by: David S. Miller <[email protected]>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mlx5/driver.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index 277a51d3ec40..f99cbe249425 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -722,6 +722,7 @@ struct mlx5_core_dev {
struct mlx5_clock clock;
struct mlx5_ib_clock_info *clock_info;
struct mlx5_fw_tracer *tracer;
+ struct mlx5_rsc_dump *rsc_dump;
u32 vsc_addr;
struct mlx5_hv_vhca *hv_vhca;
};