diff mbox series

[FOCAL/linux-azure,3/3] net/mlx5: Tidy up and fix reverse christmas ordring

Message ID 20200817123740.6938-4-william.gray@canonical.com
State New
Headers show
Series SF Case 276849 speed for CX4 VF showing as unknown in ethtool output | expand

Commit Message

William Breathitt Gray Aug. 17, 2020, 12:37 p.m. UTC 
From: Mark Bloch <markb@mellanox.com>

Use reverse chirstmas tree inside mlx5e_ethtool_get_link_ksettings.

Signed-off-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>

BugLink: https://bugs.launchpad.net/bugs/1876770

(cherry picked from commit 2f5438ca0ee01a1b3a9c37e3f33d47c8122afe74)
Signed-off-by: William Breathitt Gray <william.gray@canonical.com>
---
 .../net/ethernet/mellanox/mlx5/core/en_ethtool.c   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index a14e1a2cd429..3e74ee6f7f2d 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -884,18 +884,18 @@  int mlx5e_ethtool_get_link_ksettings(struct mlx5e_priv *priv,
 				     struct ethtool_link_ksettings *link_ksettings)
 {
 	struct mlx5_core_dev *mdev = priv->mdev;
-	u32 out[MLX5_ST_SZ_DW(ptys_reg)] = {0};
+	u32 out[MLX5_ST_SZ_DW(ptys_reg)] = {};
+	u32 eth_proto_admin;
+	u8 an_disable_admin;
 	u16 data_rate_oper;
+	u32 eth_proto_oper;
+	u32 eth_proto_cap;
+	u8 connector_type;
 	u32 rx_pause = 0;
 	u32 tx_pause = 0;
-	u32 eth_proto_cap;
-	u32 eth_proto_admin;
 	u32 eth_proto_lp;
-	u32 eth_proto_oper;
-	u8 an_disable_admin;
-	u8 an_status;
-	u8 connector_type;
 	bool admin_ext;
+	u8 an_status;
 	bool ext;
 	int err;