From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 2FB86A0A0F;
Fri, 4 Jun 2021 15:02:24 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id A37DF4068F;
Fri, 4 Jun 2021 15:02:23 +0200 (CEST)
Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com
[209.85.221.41])
by mails.dpdk.org (Postfix) with ESMTP id 3E06040147;
Fri, 4 Jun 2021 15:02:22 +0200 (CEST)
Received: by mail-wr1-f41.google.com with SMTP id n4so9257728wrw.3;
Fri, 04 Jun 2021 06:02:22 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to
:references:content-transfer-encoding:user-agent:mime-version;
bh=8Tk3N/I1uj1sd5i3Mfwyp5EV9alYh9zpoCpkj3q7toE=;
b=qoLFET9M4XiqFmbAEX4ysJrczvVDUu9ywK9IIj0JV8aE47uLopripYXkBvMNcg6Mv+
nc4WSligACRC296YcHGdzpoprW1vAn/Y/odb4VlibBWvrc4YkYiP24sJaqwsT8bRkqOn
40MFvfQZj1QNH7n++l4m2ujPD8LTRyjaU0X5m1r33cONjiHOpIoSTAGe3SFYbiURUsca
Stil7EvfmAwM6+zrX2iwKaUkEOof7CVjHbb4BlSl6IDku0OoYsU6dfsKeAdTUSMVqTej
SCN05nNvcJWDx8cQGybIYFprxR4czX8stHcQCa20c74PNkUxHH1mYcKPMqJaKq2PQkRS
zMBA==
X-Gm-Message-State: AOAM530BWZp1lDINEDZSC3MCaC3CQNhLIgZkgzl+fgv1T/D6AjduY5EM
Y1xl8Dw184g366vZmzXBpKo=
X-Google-Smtp-Source: ABdhPJyhbS+UBt7ZieUG+jukDL0yspahI3khq+XefvVQMN9THLZhB5GRIRwx206XtyMcmBoGHwamPg==
X-Received: by 2002:a5d:59a4:: with SMTP id p4mr3949779wrr.248.1622811741823;
Fri, 04 Jun 2021 06:02:21 -0700 (PDT)
Received: from localhost ([137.220.125.106])
by smtp.gmail.com with ESMTPSA id q5sm6699180wrm.15.2021.06.04.06.02.21
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 04 Jun 2021 06:02:21 -0700 (PDT)
Message-ID: <515942c4883e2222d01b269ef14ad4b9b8bdccbc.camel@debian.org>
From: Luca Boccassi <bluca@debian.org>
To: Christian Ehrhardt <christian.ehrhardt@canonical.com>, dev
<dev@dpdk.org>, Ferruh Yigit <ferruh.yigit@intel.com>
Cc: Thomas Monjalon <thomas@monjalon.net>, stable@dpdk.org
Date: Fri, 04 Jun 2021 14:02:20 +0100
In-Reply-To: <20210602143317.2333707-1-christian.ehrhardt@canonical.com>
References: <20210602143317.2333707-1-christian.ehrhardt@canonical.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.30.5-1.2
MIME-Version: 1.0
Subject: Re: [dpdk-dev] [PATCH] kni: fix compilation on SLES15-SP3
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
On Wed, 2021-06-02 at 16:33 +0200, Christian Ehrhardt wrote:
> Like what was done for mainline kernel in commit 38ad54f3bc76 ("kni: fix
> build with Linux 5.6"), a new parameter 'txqueue' has to be added to
> 'ndo_tx_timeout' ndo on SLES 15-SP3 kernel.
>=20
> Caused by:
> commit c3bf155c40e9db722feb8a08c19efd44c12d5294
> Author: Thomas Bogendoerfer <tbogendoerfer@suse.de>
> Date: Fri Sep 11 16:08:31 2020 +0200
> - netdev: pass the stuck queue to the timeout handler
> (jsc#SLE-13536).
> - Refresh patches.suse/sfc-move-various-functions.patch.
>=20
> That is part of the SLES 5.3.18 kernel and therefore the
> version we check for.
>=20
> Cc: stable@dpdk.org
>=20
> Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
> ---
> kernel/linux/kni/compat.h | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>=20
> diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
> index 5f65640d5ed..70e014fd1da 100644
> --- a/kernel/linux/kni/compat.h
> +++ b/kernel/linux/kni/compat.h
> @@ -133,7 +133,9 @@
> =20
> #if KERNEL_VERSION(5, 6, 0) <=3D LINUX_VERSION_CODE || \
> (defined(RHEL_RELEASE_CODE) && \
> - RHEL_RELEASE_VERSION(8, 3) <=3D RHEL_RELEASE_CODE)
> + RHEL_RELEASE_VERSION(8, 3) <=3D RHEL_RELEASE_CODE) || \
> + (defined(CONFIG_SUSE_KERNEL) && \
> + KERNEL_VERSION(5, 3, 18) <=3D LINUX_VERSION_CODE)
> #define HAVE_TX_TIMEOUT_TXQUEUE
> #endif
>=20
Acked-by: Luca Boccassi <bluca@debian.org>
--=20
Kind regards,
Luca Boccassi