From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 962631B70E for ; Wed, 9 May 2018 17:29:15 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from shahafs@mellanox.com) with ESMTPS (AES256-SHA encrypted); 9 May 2018 18:06:12 +0300 Received: from unicorn01.mtl.labs.mlnx. (unicorn01.mtl.labs.mlnx [10.7.12.62]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id w49F4SrY008373; Wed, 9 May 2018 18:04:30 +0300 From: Shahaf Shuler To: bluca@debian.org Cc: stable@dpdk.org, nelio.laranjeiro@6wind.com, adrien.mazarguil@6wind.com, yskoh@mellanox.com Date: Wed, 9 May 2018 18:04:09 +0300 Message-Id: <1c30adfbf7675b4385b01e76b30e8ec9a6d00ca2.1525878119.git.shahafs@mellanox.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: References: Subject: [dpdk-stable] [PATCH v2 17/20] net/mlx5: fix ethtool link setting call order X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 May 2018 15:29:16 -0000 [ upstream commit a4358b23d10d2beddbe32fac3706764b7e2af9fe ] According to ethtool_link_setting API recommendation ETHTOOL_GLINKSETTINGS should be called before ETHTOOL_GSET as the later one deprecated. Fixes: f47ba80080ab ("net/mlx5: remove kernel version check") Signed-off-by: Shahaf Shuler Acked-by: Nelio Laranjeiro --- drivers/net/mlx5/mlx5_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index 2a681a8cbe..7aa522b6e7 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -660,9 +660,9 @@ mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete) time_t start_time = time(NULL); do { - ret = mlx5_link_update_unlocked_gset(dev, &dev_link); + ret = mlx5_link_update_unlocked_gs(dev, &dev_link); if (ret) - ret = mlx5_link_update_unlocked_gs(dev, &dev_link); + ret = mlx5_link_update_unlocked_gset(dev, &dev_link); if (ret == 0) break; /* Handle wait to complete situation. */ -- 2.12.0