From: Yongseok Koh <yskoh@mellanox.com>
To: yliu@fridaylinux.org
Cc: stable@dpdk.org, shahafs@mellanox.com,
adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com
Subject: [dpdk-stable] [PATCH v2 30/67] net/mlx5: remove kernel version check
Date: Mon, 4 Jun 2018 17:38:02 -0700 [thread overview]
Message-ID: <20180605003811.14448-1-yskoh@mellanox.com> (raw)
In-Reply-To: <20180605002732.13866-1-yskoh@mellanox.com>
From: Nélio Laranjeiro <nelio.laranjeiro@6wind.com>
[ upstream commit f47ba80080ab81ad513f843407bec7178fed8857 ]
Kernel version check was introduced in
commit 3a49ffe38a95 ("net/mlx5: fix link status query")
due to a bug fixed by
commit ef09a7fc7620 ("net/mlx5: fix inconsistent link status query")
This patch restore the previous behavior as described in Linux API.
Signed-off-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
Acked-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
---
drivers/net/mlx5/mlx5_ethdev.c | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index b78756efc..7ae4e8577 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -46,11 +46,9 @@
#include <net/if.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
-#include <sys/utsname.h>
#include <netinet/in.h>
#include <linux/ethtool.h>
#include <linux/sockios.h>
-#include <linux/version.h>
#include <fcntl.h>
#include <stdalign.h>
#include <sys/un.h>
@@ -756,20 +754,15 @@ mlx5_force_link_status_change(struct rte_eth_dev *dev, int status)
int
mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete __rte_unused)
{
- struct utsname utsname;
- int ver[3];
int ret;
struct rte_eth_link dev_link = dev->data->dev_link;
- if (uname(&utsname) == -1 ||
- sscanf(utsname.release, "%d.%d.%d",
- &ver[0], &ver[1], &ver[2]) != 3 ||
- KERNEL_VERSION(ver[0], ver[1], ver[2]) < KERNEL_VERSION(4, 9, 0))
- ret = mlx5_link_update_unlocked_gset(dev);
- else
+ ret = mlx5_link_update_unlocked_gset(dev);
+ if (ret) {
ret = mlx5_link_update_unlocked_gs(dev);
- if (ret)
- return ret;
+ if (ret)
+ return ret;
+ }
/* If lsc interrupt is disabled, should always be ready for traffic. */
if (!dev->data->dev_conf.intr_conf.lsc) {
mlx5_link_start(dev);
--
2.11.0
next prev parent reply other threads:[~2018-06-05 0:38 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-05 0:27 [dpdk-stable] [PATCH v2 00/67] net/mlx5: backport patches for v17.11.3 LTS Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 01/67] net/mlx5: remove get priv internal function Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 02/67] net/mlx4: store RSS hash result in mbufs Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 03/67] net/mlx5: fix synchronization on polling Rx completions Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 04/67] net/mlx5: fix allocation when no memory on device NUMA node Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 05/67] net/mlx5: fix flow director conversion Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 06/67] net/mlx5: fix reception of multiple MAC addresses Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 07/67] net/mlx5: fix secondary process mempool registration Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 08/67] net/mlx5: remove assert un-accessible from secondary process Yongseok Koh
2018-06-05 0:27 ` [dpdk-stable] [PATCH v2 09/67] net/mlx5: warn for unsuccessful memory registration Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 10/67] net/mlx5: map UAR address around huge pages Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 11/67] net/mlx4: fix single port configuration Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 12/67] net/mlx4: fix broadcast Rx Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 13/67] net/mlx4: fix removal detection of stopped port Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 14/67] net/mlx5: fix CRC strip capability query Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 15/67] net/mlx5: fix close after start failure Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 16/67] net/mlx: control netdevices through ioctl only Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 17/67] net/mlx5: fix disabling Tx packet inlining Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 18/67] net/mlx5: fix sriov flag Yongseok Koh
2018-06-05 0:35 ` [dpdk-stable] [PATCH v2 19/67] net/mlx5: name parameters in function prototypes Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 20/67] net/mlx5: mark parameters with unused attribute Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 21/67] net/mlx5: normalize function prototypes Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 22/67] net/mlx5: add missing function documentation Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 23/67] net/mlx5: remove useless empty lines Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 24/67] net/mlx5: remove control path locks Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 25/67] net/mlx5: prefix all functions with mlx5 Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 26/67] net/mlx5: change non failing function return values Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 27/67] net/mlx5: standardize on negative errno values Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 28/67] net/mlx5: use port id in PMD log Yongseok Koh
2018-06-05 0:37 ` [dpdk-stable] [PATCH v2 29/67] net/mlx5: use dynamic logging Yongseok Koh
2018-06-05 0:38 ` Yongseok Koh [this message]
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 31/67] net/mlx5: change pkt burst select function prototype Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 32/67] net/mlx5: fix link status behavior Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 33/67] net/mlx5: fix link status to use wait to complete Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 34/67] net/mlx5: change tunnel flow priority Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 35/67] net/mlx5: improve flow error explanation Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 36/67] net/mlx5: refuse empty VLAN flow specification Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 37/67] net/mlx5: fix icc build Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 38/67] net/mlx5: setup RSS regardless of queue count Yongseok Koh
2018-06-05 0:38 ` [dpdk-stable] [PATCH v2 39/67] net/mlx5: enforce RSS key length limitation Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 40/67] net/mlx5: fix RSS key length query Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 41/67] net/mlx4: fix a typo in header file Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 42/67] net/mlx5: remove 32-bit support Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 43/67] net/mlx5: remove excessive data prefetch Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 44/67] net/mlx5: fix link status initialization Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 45/67] net/mlx4: fix RSS resource leak in case of error Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 46/67] net/mlx5: fix RSS flow action bounds check Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 47/67] net/mlx5: fix invalid flow item check Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 48/67] net/mlx5: split L3/L4 in flow director Yongseok Koh
2018-06-05 0:39 ` [dpdk-stable] [PATCH v2 49/67] net/mlx5: fix flow director mask Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 50/67] net/mlx5: fix flow director rule deletion crash Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 51/67] net/mlx4: fix Rx resource leak in case of error Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 52/67] net/mlx5: fix ethtool link setting call order Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 53/67] net/mlx5: fix socket connection return value Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 54/67] net/mlx5: add data-plane debug message macro Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 55/67] net/mlx5: fix probe return value polarity Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 56/67] net/mlx5: fix flow validation Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 57/67] net/mlx4: fix UDP flow rule limitation enforcement Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 58/67] net/mlx5: fix double free on error handling Yongseok Koh
2018-06-05 0:40 ` [dpdk-stable] [PATCH v2 59/67] net/mlx5: fix resource leak in case of error Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 60/67] net/mlx5: fix calculation of Tx TSO inline room size Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 61/67] net/mlx5: change device reference for secondary process Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 62/67] net/mlx4: avoid constant recreations in function Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 63/67] net/mlx5: fix flow director drop rule deletion crash Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 64/67] net/mlx5: fix build with clang on ARM Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 65/67] net/mlx5: fix count in xstats Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 66/67] net: add IPv6 header fields macros Yongseok Koh
2018-06-05 0:41 ` [dpdk-stable] [PATCH v2 67/67] net/mlx5: fix IPv6 header fields Yongseok Koh
2018-06-08 15:25 ` [dpdk-stable] [PATCH v2 00/67] net/mlx5: backport patches for v17.11.3 LTS Yuanhan Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180605003811.14448-1-yskoh@mellanox.com \
--to=yskoh@mellanox.com \
--cc=adrien.mazarguil@6wind.com \
--cc=nelio.laranjeiro@6wind.com \
--cc=shahafs@mellanox.com \
--cc=stable@dpdk.org \
--cc=yliu@fridaylinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).