svn commit: r329300 - stable/10/sys/dev/mlx5/mlx5_en

[Hans Petter Selasky]

Author: hselasky
Date: Thu Feb 15 08:48:04 2018
New Revision: 329300
URL: https://svnweb.freebsd.org/changeset/base/329300

Log:
  MFC r328591:
  Move the mlx5 core device pointer first in the mlx5en priv. This help simplify
  checks to recognize own network devices when using mlx5ib. This patch fixes
  an issues where mlx5ib fails to recognize mceX network devices for use with
  RoCE.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/10/sys/dev/mlx5/mlx5_en/en.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/mlx5/mlx5_en/en.h
==============================================================================
--- stable/10/sys/dev/mlx5/mlx5_en/en.h	Thu Feb 15 08:46:20 2018	(r329299)
+++ stable/10/sys/dev/mlx5/mlx5_en/en.h	Thu Feb 15 08:48:04 2018	(r329300)
@@ -644,6 +644,8 @@ struct mlx5e_flow_table {
 };
 
 struct mlx5e_priv {
+	struct mlx5_core_dev *mdev;     /* must be first */
+
 	/* priv data path fields - start */
 	int	order_base_2_num_channels;
 	int	queue_mapping_channel_mask;
@@ -681,7 +683,6 @@ struct mlx5e_priv {
 	struct work_struct set_rx_mode_work;
 	MLX5_DECLARE_DOORBELL_LOCK(doorbell_lock)
 
-	struct mlx5_core_dev *mdev;
 	struct ifnet *ifp;
 	struct sysctl_ctx_list sysctl_ctx;
 	struct sysctl_oid *sysctl_ifnet;